diff --git a/src/applications/maniphest/controller/ManiphestBatchEditController.php b/src/applications/maniphest/controller/ManiphestBatchEditController.php
index a93b9be0d7..12f31c00d3 100644
--- a/src/applications/maniphest/controller/ManiphestBatchEditController.php
+++ b/src/applications/maniphest/controller/ManiphestBatchEditController.php
@@ -114,12 +114,9 @@ final class ManiphestBatchEditController extends ManiphestController {
           'name' => 'actions',
           'id'   => 'batch-form-actions',
         )));
-    $form->appendChild(
-      phutil_tag('p', array(), pht('These tasks will be edited:')));
-    $form->appendChild($list);
     $form->appendChild(
       id(new PHUIFormInsetView())
-        ->setTitle('Actions')
+        ->setTitle(pht('Actions'))
         ->setRightButton(javelin_tag(
             'a',
             array(
@@ -146,18 +143,22 @@ final class ManiphestBatchEditController extends ManiphestController {
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb($title);
 
+    $task_box = id(new PHUIObjectBoxView())
+      ->setHeaderText(pht('Selected Tasks'))
+      ->appendChild($list);
+
     $form_box = id(new PHUIObjectBoxView())
-      ->setHeaderText(pht('Batch Edit Tasks'))
+      ->setHeaderText(pht('Batch Editor'))
       ->setForm($form);
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
+        $task_box,
         $form_box,
       ),
       array(
         'title' => $title,
-        'device' => false,
       ));
   }
 
diff --git a/src/view/form/PHUIFormInsetView.php b/src/view/form/PHUIFormInsetView.php
index 89a23feb2b..1d66df6d8a 100644
--- a/src/view/form/PHUIFormInsetView.php
+++ b/src/view/form/PHUIFormInsetView.php
@@ -69,6 +69,7 @@ final class PHUIFormInsetView extends AphrontView {
           'style' => 'float: right;',
         ),
         $this->rightButton);
+      $right_button = phutil_tag_div('grouped', $right_button);
     }
 
     if ($this->description) {
@@ -76,10 +77,6 @@ final class PHUIFormInsetView extends AphrontView {
         'p',
         array(),
         $this->description);
-
-      if ($right_button) {
-        $desc = hsprintf('%s<div style="clear: both;"></div>', $desc);
-      }
     }
 
     $div_attributes = $this->divAttributes;