diff --git a/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php b/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php
index 443a7e37d3..f86f9eb4d1 100644
--- a/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php
+++ b/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php
@@ -123,8 +123,7 @@ final class PhabricatorApplicationDetailViewController
     PhabricatorApplication $application) {
 
     $viewer = $this->getViewer();
-    $properties = id(new PHUIPropertyListView())
-      ->setStacked(true);
+    $properties = id(new PHUIPropertyListView());
 
     $header = id(new PHUIHeaderView())
       ->setHeader(pht('POLICIES'))
diff --git a/src/applications/meta/controller/PhabricatorApplicationEditController.php b/src/applications/meta/controller/PhabricatorApplicationEditController.php
index d9d7b3c15c..ed51405db9 100644
--- a/src/applications/meta/controller/PhabricatorApplicationEditController.php
+++ b/src/applications/meta/controller/PhabricatorApplicationEditController.php
@@ -171,22 +171,27 @@ final class PhabricatorApplicationEditController
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb($application->getName(), $view_uri);
     $crumbs->addTextCrumb(pht('Edit Policies'));
+    $crumbs->setBorder(true);
 
     $header = id(new PHUIHeaderView())
-      ->setHeader(pht('Edit Policies: %s', $application->getName()));
+      ->setHeader(pht('Edit Policies: %s', $application->getName()))
+      ->setHeaderIcon('fa-pencil');
 
     $object_box = id(new PHUIObjectBoxView())
-      ->setHeader($header)
+      ->setHeaderText(pht('Policies'))
+      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
       ->setForm($form);
 
-    return $this->buildApplicationPage(
-      array(
-        $crumbs,
+    $view = id(new PHUITwoColumnView())
+      ->setHeader($header)
+      ->setFooter(array(
         $object_box,
-      ),
-      array(
-        'title' => $title,
       ));
+
+    return $this->newPage()
+      ->setTitle($title)
+      ->setCrumbs($crumbs)
+      ->appendChild($view);
   }
 
 }
diff --git a/src/applications/meta/controller/PhabricatorApplicationEmailCommandsController.php b/src/applications/meta/controller/PhabricatorApplicationEmailCommandsController.php
index 08f8e450b5..2979e92229 100644
--- a/src/applications/meta/controller/PhabricatorApplicationEmailCommandsController.php
+++ b/src/applications/meta/controller/PhabricatorApplicationEmailCommandsController.php
@@ -137,14 +137,10 @@ final class PhabricatorApplicationEmailCommandsController
       ->appendChild($info_view)
       ->appendChild($content_box);
 
-    return $this->buildApplicationPage(
-      array(
-        $crumbs,
-        $document,
-      ),
-      array(
-        'title' => $title,
-      ));
+    return $this->newPage()
+      ->setTitle($title)
+      ->setCrumbs($crumbs)
+      ->appendChild($document);
 
   }
 
diff --git a/src/applications/meta/controller/PhabricatorApplicationPanelController.php b/src/applications/meta/controller/PhabricatorApplicationPanelController.php
index 48355d131f..4fab71c501 100644
--- a/src/applications/meta/controller/PhabricatorApplicationPanelController.php
+++ b/src/applications/meta/controller/PhabricatorApplicationPanelController.php
@@ -59,9 +59,14 @@ final class PhabricatorApplicationPanelController
 
   public function buildPanelPage(
     PhabricatorApplicationConfigurationPanel $panel,
-    $content,
-    array $options) {
-    return $this->buildApplicationPage($content, $options);
+    $title,
+    $crumbs,
+    $content) {
+
+    return $this->newPage()
+      ->setTitle($title)
+      ->setCrumbs($crumbs)
+      ->appendChild($content);
   }
 
 }
diff --git a/src/applications/metamta/applicationpanel/PhabricatorMetaMTAApplicationEmailPanel.php b/src/applications/metamta/applicationpanel/PhabricatorMetaMTAApplicationEmailPanel.php
index 1899ac1be1..a2d32e3360 100644
--- a/src/applications/metamta/applicationpanel/PhabricatorMetaMTAApplicationEmailPanel.php
+++ b/src/applications/metamta/applicationpanel/PhabricatorMetaMTAApplicationEmailPanel.php
@@ -37,6 +37,7 @@ final class PhabricatorMetaMTAApplicationEmailPanel
 
     $box = id(new PHUIObjectBoxView())
       ->setHeader($header)
+      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
       ->setTable($table);
 
     return $box;
@@ -81,10 +82,12 @@ final class PhabricatorMetaMTAApplicationEmailPanel
 
     $crumbs = $controller->buildPanelCrumbs($this);
     $crumbs->addTextCrumb(pht('Edit Application Emails'));
+    $crumbs->setBorder(true);
 
     $header = id(new PHUIHeaderView())
       ->setHeader(pht('Edit Application Emails: %s', $application->getName()))
-      ->setSubheader($application->getAppEmailBlurb());
+      ->setSubheader($application->getAppEmailBlurb())
+      ->setHeaderIcon('fa-pencil');
 
     $icon = id(new PHUIIconView())
       ->setIcon('fa-plus');
@@ -97,20 +100,20 @@ final class PhabricatorMetaMTAApplicationEmailPanel
     $header->addActionLink($button);
 
     $object_box = id(new PHUIObjectBoxView())
-      ->setHeader($header)
+      ->setHeaderText(pht('Emails'))
+      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
       ->setTable($table);
 
     $title = $application->getName();
+    $view = id(new PHUITwoColumnView())
+      ->setHeader($header)
+      ->setFooter($object_box);
 
     return $controller->buildPanelPage(
       $this,
-      array(
-        $crumbs,
-        $object_box,
-      ),
-      array(
-        'title' => $title,
-      ));
+      $title,
+      $crumbs,
+      $view);
   }
 
   private function returnNewAddressResponse(