diff --git a/ietf/static/js/manage-review-requests.js b/ietf/static/js/manage-review-requests.js
index c3329f890..294782310 100644
--- a/ietf/static/js/manage-review-requests.js
+++ b/ietf/static/js/manage-review-requests.js
@@ -13,22 +13,36 @@ $(function () {
 
   function setControlDisplay (row) {
     const action = row.find('[name$="-action"]').val()
+    const reviewerControls = row.find('.reviewer-controls')
+    const reviewerButtons = reviewerControls.find('button')
+    const closeControls = row.find('.close-controls')
+    const closeButtons = reviewerControls.find('button')
+    const actionElements = row.find('.assign-action,.close-action')
+    const actionButtons = actionElements.find('button')
+
     switch (action) {
       case 'assign':
-        row.find('.reviewer-controls').show()
-        row.find('.close-controls').hide()
-        row.find('.assign-action,.close-action').hide()
+        reviewerControls.show()
+        closeButtons.tooltip('hide')
+        closeControls.hide()
+        actionButtons.tooltip('hide')
+        actionElements.hide()
         break
 
       case 'close':
-        row.find('.reviewer-controls').hide()
-        row.find('.close-controls').show()
-        row.find('.assign-action,.close-action').hide()
+        reviewerButtons.tooltip('hide')
+        reviewerControls.hide()
+        closeControls.show()
+        actionButtons.tooltip('hide')
+        actionElements.hide()
         break
 
       default:
-        row.find('.reviewer-controls,.close-controls').hide()
-        row.find('.assign-action,.close-action').show()
+        closeButtons.tooltip('hide')
+        closeControls.hide()
+        reviewerButtons.tooltip('hide')
+        reviewerControls.hide()
+        actionElements.show()
     }
 
     updateSaveButtons()
diff --git a/ietf/templates/group/manage_review_requests.html b/ietf/templates/group/manage_review_requests.html
index 0ff8dcc09..8cc25d0ee 100644
--- a/ietf/templates/group/manage_review_requests.html
+++ b/ietf/templates/group/manage_review_requests.html
@@ -184,14 +184,16 @@
                                 {% if r.form.review_type %}
                                     {% bootstrap_field r.form.review_type layout="horizontal" wrapper_class="col" size="sm" %}
                                 {% endif %}
-                                {% bootstrap_field r.form.reviewer layout="horizontal" wrapper_class="col row" size="sm" %}
+                                {% bootstrap_field r.form.reviewer layout="horizontal" wrapper_class="col row" label_class="p-0" size="sm" %}
                                 {% bootstrap_field r.form.add_skip layout="horizontal" wrapper_class="col col-2" size="sm" %}
-                                <button type="button"
-                                        class="btn btn-sm btn-primary undo col col-1"
-                                        title="Cancel assignment"
-                                        data-initial="{{ r.form.fields.reviewer.initial|default:"" }}">
-                                    Cancel
-                                </button>
+                                <div class="col col-1">
+                                    <button type="button"
+                                            class="btn btn-sm btn-primary undo"
+                                            title="Cancel assignment"
+                                            data-initial="{{ r.form.fields.reviewer.initial|default:"" }}">
+                                        Cancel
+                                    </button>
+                                </div>
                                 {% if r.form.reviewer.errors or r.form.add_skip.errors %}
                                     <div class="alert alert-danger my-3">
                                         {% for e in r.form.reviewer.errors %}{{ e }}{% endfor %}