diff --git a/src/applications/diviner/controller/DivinerAtomController.php b/src/applications/diviner/controller/DivinerAtomController.php
--- a/src/applications/diviner/controller/DivinerAtomController.php
+++ b/src/applications/diviner/controller/DivinerAtomController.php
@@ -240,14 +240,12 @@
 
     $prop_list = phutil_tag_div('phui-document-view-pro-box', $prop_list);
 
-    return $this->buildApplicationPage(
-      array(
-        $crumbs,
+    return $this->newPage()
+      ->setTitle($symbol->getTitle())
+      ->setCrumbs($crumbs)
+      ->appendChild(array(
         $document,
         $prop_list,
-      ),
-      array(
-        'title' => $symbol->getTitle(),
       ));
   }
 
diff --git a/src/applications/diviner/controller/DivinerBookController.php b/src/applications/diviner/controller/DivinerBookController.php
--- a/src/applications/diviner/controller/DivinerBookController.php
+++ b/src/applications/diviner/controller/DivinerBookController.php
@@ -92,13 +92,11 @@
     $document->appendChild($preface_view);
     $document->appendChild($out);
 
-    return $this->buildApplicationPage(
-      array(
-        $crumbs,
+    return $this->newPage()
+      ->setTitle($book->getTitle())
+      ->setCrumbs($crumbs)
+      ->appendChild(array(
         $document,
-      ),
-      array(
-        'title' => $book->getTitle(),
       ));
   }
 
diff --git a/src/applications/diviner/controller/DivinerBookEditController.php b/src/applications/diviner/controller/DivinerBookEditController.php
--- a/src/applications/diviner/controller/DivinerBookEditController.php
+++ b/src/applications/diviner/controller/DivinerBookEditController.php
@@ -57,8 +57,10 @@
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb(pht('Edit Basics'));
+    $crumbs->setBorder(true);
 
-    $title = pht('Edit %s', $book->getTitle());
+    $title = pht('Edit Book: %s', $book->getTitle());
+    $header_icon = 'fa-pencil';
 
     $policies = id(new PhabricatorPolicyQuery())
       ->setViewer($viewer)
@@ -104,8 +106,9 @@
           ->setValue(pht('Save'))
           ->addCancelButton($view_uri));
 
-    $object_box = id(new PHUIObjectBoxView())
-      ->setHeaderText($title)
+    $box = id(new PHUIObjectBoxView())
+      ->setHeaderText(pht('Book'))
+      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
       ->setForm($form);
 
     $timeline = $this->buildTransactionTimeline(
@@ -113,15 +116,21 @@
       new DivinerLiveBookTransactionQuery());
     $timeline->setShouldTerminate(true);
 
-    return $this->buildApplicationPage(
-      array(
-        $crumbs,
-        $object_box,
+    $header = id(new PHUIHeaderView())
+      ->setHeader($title)
+      ->setHeaderIcon($header_icon);
+
+    $view = id(new PHUITwoColumnView())
+      ->setHeader($header)
+      ->setFooter(array(
+        $box,
         $timeline,
-      ),
-      array(
-        'title' => $title,
       ));
+
+    return $this->newPage()
+      ->setTitle($title)
+      ->setCrumbs($crumbs)
+      ->appendChild($view);
   }
 
 }
diff --git a/src/applications/diviner/controller/DivinerFindController.php b/src/applications/diviner/controller/DivinerFindController.php
--- a/src/applications/diviner/controller/DivinerFindController.php
+++ b/src/applications/diviner/controller/DivinerFindController.php
@@ -84,11 +84,12 @@
 
     $list = $this->renderAtomList($atoms);
 
-    return $this->buildApplicationPage(
-      $list,
-      array(
-        'title' => array(pht('Find'), pht('"%s"', $query_text)),
+    return $this->newPage()
+      ->setTitle(array(pht('Find'), pht('"%s"', $query_text)))
+      ->appendChild(array(
+        $list,
       ));
+
   }
 
 }
diff --git a/src/applications/diviner/controller/DivinerMainController.php b/src/applications/diviner/controller/DivinerMainController.php
--- a/src/applications/diviner/controller/DivinerMainController.php
+++ b/src/applications/diviner/controller/DivinerMainController.php
@@ -65,13 +65,11 @@
       $document->appendChild($text);
     }
 
-    return $this->buildApplicationPage(
-      array(
-        $crumbs,
+    return $this->newPage()
+      ->setTitle(pht('Documentation Books'))
+      ->setCrumbs($crumbs)
+      ->appendChild(array(
         $document,
-      ),
-      array(
-        'title' => pht('Documentation Books'),
       ));
   }
 }