diff --git a/src/applications/ponder/controller/PonderAnswerEditController.php b/src/applications/ponder/controller/PonderAnswerEditController.php
index ff2fd35920..3362e15834 100644
--- a/src/applications/ponder/controller/PonderAnswerEditController.php
+++ b/src/applications/ponder/controller/PonderAnswerEditController.php
@@ -1,116 +1,124 @@
 <?php
 
 final class PonderAnswerEditController extends PonderController {
 
   public function handleRequest(AphrontRequest $request) {
     $viewer = $request->getViewer();
     $id = $request->getURIData('id');
 
     $answer = id(new PonderAnswerQuery())
       ->setViewer($viewer)
       ->withIDs(array($id))
       ->requireCapabilities(
         array(
           PhabricatorPolicyCapability::CAN_VIEW,
           PhabricatorPolicyCapability::CAN_EDIT,
         ))
       ->executeOne();
     if (!$answer) {
       return new Aphront404Response();
     }
 
     $v_content = $answer->getContent();
     $v_status = $answer->getStatus();
     $e_content = true;
 
 
     $question = $answer->getQuestion();
     $qid = $question->getID();
 
     $answer_uri = $answer->getURI();
 
     $errors = array();
     if ($request->isFormPost()) {
       $v_content = $request->getStr('content');
       $v_status = $request->getStr('status');
 
       if (!strlen($v_content)) {
         $errors[] = pht('You must provide some substance in your answer.');
         $e_content = pht('Required');
       }
 
       if (!$errors) {
         $xactions = array();
         $xactions[] = id(new PonderAnswerTransaction())
           ->setTransactionType(PonderAnswerTransaction::TYPE_CONTENT)
           ->setNewValue($v_content);
 
         $xactions[] = id(new PonderAnswerTransaction())
           ->setTransactionType(PonderAnswerTransaction::TYPE_STATUS)
           ->setNewValue($v_status);
 
         $editor = id(new PonderAnswerEditor())
           ->setActor($viewer)
           ->setContentSourceFromRequest($request)
           ->setContinueOnNoEffect(true);
 
         $editor->applyTransactions($answer, $xactions);
 
         return id(new AphrontRedirectResponse())
           ->setURI($answer_uri);
       }
     }
 
     $answer_content_id = celerity_generate_unique_node_id();
 
     $form = id(new AphrontFormView())
       ->setUser($viewer)
       ->appendChild(
         id(new AphrontFormStaticControl())
           ->setLabel(pht('Question'))
           ->setValue($question->getTitle()))
       ->appendChild(
           id(new AphrontFormSelectControl())
             ->setLabel(pht('Status'))
             ->setName('status')
             ->setValue($v_status)
             ->setOptions(PonderAnswerStatus::getAnswerStatusMap()))
       ->appendChild(
         id(new PhabricatorRemarkupControl())
           ->setUser($viewer)
           ->setLabel(pht('Answer'))
           ->setName('content')
           ->setID($answer_content_id)
           ->setValue($v_content)
           ->setError($e_content))
       ->appendChild(
         id(new AphrontFormSubmitControl())
           ->setValue(pht('Submit'))
           ->addCancelButton($answer_uri));
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb("Q{$qid}", $answer_uri);
     $crumbs->addTextCrumb(pht('Edit Answer'));
+    $crumbs->setBorder(true);
 
-    $form_box = id(new PHUIObjectBoxView())
-      ->setHeaderText(pht('Edit Answer'))
+    $header = id(new PHUIHeaderView())
+      ->setHeader(pht('Edit Answer'))
+      ->setHeaderIcon('fa-pencil');
+
+    $box = id(new PHUIObjectBoxView())
+      ->setHeaderText(pht('Answer'))
       ->setFormErrors($errors)
+      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
       ->setForm($form);
 
     $preview = id(new PHUIRemarkupPreviewPanel())
       ->setHeader(pht('Answer Preview'))
       ->setControlID($answer_content_id)
       ->setPreviewURI($this->getApplicationURI('preview/'));
 
-    return $this->buildApplicationPage(
-      array(
-        $crumbs,
-        $form_box,
+    $view = id(new PHUITwoColumnView())
+      ->setHeader($header)
+      ->setFooter(array(
+        $box,
         $preview,
-      ),
-      array(
-        'title' => pht('Edit Answer'),
       ));
 
+    return $this->newPage()
+      ->setTitle(pht('Edit Answer'))
+      ->setCrumbs($crumbs)
+      ->appendChild($view);
+
   }
 }
diff --git a/src/applications/ponder/controller/PonderAnswerHistoryController.php b/src/applications/ponder/controller/PonderAnswerHistoryController.php
index 136cd8532e..9d7b96335a 100644
--- a/src/applications/ponder/controller/PonderAnswerHistoryController.php
+++ b/src/applications/ponder/controller/PonderAnswerHistoryController.php
@@ -1,46 +1,50 @@
 <?php
 
 final class PonderAnswerHistoryController extends PonderController {
 
   public function shouldAllowPublic() {
     return true;
   }
 
   public function handleRequest(AphrontRequest $request) {
     $viewer = $request->getViewer();
     $id = $request->getURIData('id');
 
     $answer = id(new PonderAnswerQuery())
       ->setViewer($viewer)
       ->withIDs(array($id))
       ->executeOne();
     if (!$answer) {
       return new Aphront404Response();
     }
 
-
     $timeline = $this->buildTransactionTimeline(
       $answer,
       new PonderAnswerTransactionQuery());
     $timeline->setShouldTerminate(true);
 
     $qid = $answer->getQuestion()->getID();
     $aid = $answer->getID();
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->setBorder(true);
     $crumbs->addTextCrumb("Q{$qid}", "/Q{$qid}");
     $crumbs->addTextCrumb("A{$aid}", "/Q{$qid}#{$aid}");
     $crumbs->addTextCrumb(pht('History'));
+    $crumbs->setBorder(true);
+
+    $header = id(new PHUIHeaderView())
+      ->setHeader(pht('Answer History'))
+      ->setHeaderIcon('fa-history');
+
+    $view = id(new PHUITwoColumnView())
+      ->setHeader($header)
+      ->setFooter($timeline);
 
-    return $this->buildApplicationPage(
-      array(
-        $crumbs,
-        $timeline,
-      ),
-      array(
-        'title' => pht('Answer History'),
-      ));
+    return $this->newPage()
+      ->setTitle(pht('Answer History'))
+      ->setCrumbs($crumbs)
+      ->appendChild($view);
   }
 
 }
diff --git a/src/applications/ponder/controller/PonderQuestionCommentController.php b/src/applications/ponder/controller/PonderQuestionCommentController.php
index 4834d8040c..84c276cd5d 100644
--- a/src/applications/ponder/controller/PonderQuestionCommentController.php
+++ b/src/applications/ponder/controller/PonderQuestionCommentController.php
@@ -1,63 +1,58 @@
 <?php
 
 final class PonderQuestionCommentController extends PonderController {
 
   public function handleRequest(AphrontRequest $request) {
     $viewer = $request->getViewer();
     $id = $request->getURIData('id');
 
     if (!$request->isFormPost()) {
       return new Aphront400Response();
     }
 
     $question = id(new PonderQuestionQuery())
       ->setViewer($viewer)
       ->withIDs(array($id))
       ->executeOne();
     if (!$question) {
       return new Aphront404Response();
     }
 
     $is_preview = $request->isPreviewRequest();
-//    $draft = PhabricatorDraft::buildFromRequest($request);
 
     $qid = $question->getID();
     $view_uri = "/Q{$qid}";
 
     $xactions = array();
     $xactions[] = id(new PonderQuestionTransaction())
       ->setTransactionType(PhabricatorTransactions::TYPE_COMMENT)
       ->attachComment(
         id(new PonderQuestionTransactionComment())
           ->setContent($request->getStr('comment')));
 
     $editor = id(new PonderQuestionEditor())
       ->setActor($viewer)
       ->setContinueOnNoEffect($request->isContinueRequest())
       ->setContentSourceFromRequest($request)
       ->setIsPreview($is_preview);
 
     try {
       $xactions = $editor->applyTransactions($question, $xactions);
     } catch (PhabricatorApplicationTransactionNoEffectException $ex) {
       return id(new PhabricatorApplicationTransactionNoEffectResponse())
         ->setCancelURI($view_uri)
         ->setException($ex);
     }
 
-//    if ($draft) {
-//      $draft->replaceOrDelete();
-//    }
-
     if ($request->isAjax() && $is_preview) {
       return id(new PhabricatorApplicationTransactionResponse())
         ->setViewer($viewer)
         ->setTransactions($xactions)
         ->setIsPreview($is_preview);
     } else {
       return id(new AphrontRedirectResponse())
         ->setURI($view_uri);
     }
   }
 
 }
diff --git a/src/applications/ponder/controller/PonderQuestionEditController.php b/src/applications/ponder/controller/PonderQuestionEditController.php
index d31db7c157..907094c7e9 100644
--- a/src/applications/ponder/controller/PonderQuestionEditController.php
+++ b/src/applications/ponder/controller/PonderQuestionEditController.php
@@ -1,208 +1,219 @@
 <?php
 
 final class PonderQuestionEditController extends PonderController {
 
   public function handleRequest(AphrontRequest $request) {
     $viewer = $request->getViewer();
     $id = $request->getURIData('id');
 
     if ($id) {
       $question = id(new PonderQuestionQuery())
         ->setViewer($viewer)
         ->withIDs(array($id))
         ->requireCapabilities(
           array(
             PhabricatorPolicyCapability::CAN_VIEW,
             PhabricatorPolicyCapability::CAN_EDIT,
           ))
         ->executeOne();
       if (!$question) {
         return new Aphront404Response();
       }
       $v_projects = PhabricatorEdgeQuery::loadDestinationPHIDs(
         $question->getPHID(),
         PhabricatorProjectObjectHasProjectEdgeType::EDGECONST);
       $v_projects = array_reverse($v_projects);
       $is_new = false;
     } else {
       $is_new = true;
       $question = PonderQuestion::initializeNewQuestion($viewer);
       $v_projects = array();
     }
 
     $v_title = $question->getTitle();
     $v_content = $question->getContent();
     $v_wiki = $question->getAnswerWiki();
     $v_view = $question->getViewPolicy();
     $v_space = $question->getSpacePHID();
     $v_status = $question->getStatus();
 
 
     $errors = array();
     $e_title = true;
     if ($request->isFormPost()) {
       $v_title = $request->getStr('title');
       $v_content = $request->getStr('content');
       $v_wiki = $request->getStr('answerWiki');
       $v_projects = $request->getArr('projects');
       $v_view = $request->getStr('viewPolicy');
       $v_space = $request->getStr('spacePHID');
       $v_status = $request->getStr('status');
 
       $len = phutil_utf8_strlen($v_title);
       if ($len < 1) {
         $errors[] = pht('Title must not be empty.');
         $e_title = pht('Required');
       } else if ($len > 255) {
         $errors[] = pht('Title is too long.');
         $e_title = pht('Too Long');
       }
 
       if (!$errors) {
         $template = id(new PonderQuestionTransaction());
         $xactions = array();
 
         $xactions[] = id(clone $template)
           ->setTransactionType(PonderQuestionTransaction::TYPE_TITLE)
           ->setNewValue($v_title);
 
         $xactions[] = id(clone $template)
           ->setTransactionType(PonderQuestionTransaction::TYPE_CONTENT)
           ->setNewValue($v_content);
 
         $xactions[] = id(clone $template)
           ->setTransactionType(PonderQuestionTransaction::TYPE_ANSWERWIKI)
           ->setNewValue($v_wiki);
 
         if (!$is_new) {
           $xactions[] = id(clone $template)
             ->setTransactionType(PonderQuestionTransaction::TYPE_STATUS)
             ->setNewValue($v_status);
         }
 
         $xactions[] = id(clone $template)
           ->setTransactionType(PhabricatorTransactions::TYPE_VIEW_POLICY)
           ->setNewValue($v_view);
 
         $xactions[] = id(clone $template)
           ->setTransactionType(PhabricatorTransactions::TYPE_SPACE)
           ->setNewValue($v_space);
 
         $proj_edge_type = PhabricatorProjectObjectHasProjectEdgeType::EDGECONST;
         $xactions[] = id(new PonderQuestionTransaction())
           ->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
           ->setMetadataValue('edge:type', $proj_edge_type)
           ->setNewValue(array('=' => array_fuse($v_projects)));
 
         $editor = id(new PonderQuestionEditor())
           ->setActor($viewer)
           ->setContentSourceFromRequest($request)
           ->setContinueOnNoEffect(true);
 
         $editor->applyTransactions($question, $xactions);
 
         return id(new AphrontRedirectResponse())
           ->setURI('/Q'.$question->getID());
       }
     }
 
     $policies = id(new PhabricatorPolicyQuery())
       ->setViewer($viewer)
       ->setObject($question)
       ->execute();
 
     $form = id(new AphrontFormView())
       ->setUser($viewer)
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('Question'))
           ->setName('title')
           ->setValue($v_title)
           ->setError($e_title))
       ->appendChild(
         id(new PhabricatorRemarkupControl())
           ->setUser($viewer)
           ->setName('content')
           ->setID('content')
           ->setValue($v_content)
           ->setLabel(pht('Question Details'))
           ->setUser($viewer))
       ->appendChild(
         id(new PhabricatorRemarkupControl())
           ->setUser($viewer)
           ->setName('answerWiki')
           ->setID('answerWiki')
           ->setValue($v_wiki)
           ->setLabel(pht('Answer Summary'))
           ->setUser($viewer))
       ->appendControl(
         id(new AphrontFormPolicyControl())
           ->setName('viewPolicy')
           ->setPolicyObject($question)
           ->setSpacePHID($v_space)
           ->setPolicies($policies)
           ->setValue($v_view)
           ->setCapability(PhabricatorPolicyCapability::CAN_VIEW));
 
 
     if (!$is_new) {
       $form->appendChild(
           id(new AphrontFormSelectControl())
             ->setLabel(pht('Status'))
             ->setName('status')
             ->setValue($v_status)
             ->setOptions(PonderQuestionStatus::getQuestionStatusMap()));
     }
 
     $form->appendControl(
       id(new AphrontFormTokenizerControl())
         ->setLabel(pht('Projects'))
         ->setName('projects')
         ->setValue($v_projects)
         ->setDatasource(new PhabricatorProjectDatasource()));
 
     $form->appendChild(
       id(new AphrontFormSubmitControl())
         ->addCancelButton($this->getApplicationURI())
         ->setValue(pht('Submit')));
 
     $preview = id(new PHUIRemarkupPreviewPanel())
       ->setHeader(pht('Question Preview'))
       ->setControlID('content')
       ->setPreviewURI($this->getApplicationURI('preview/'));
 
     $answer_preview = id(new PHUIRemarkupPreviewPanel())
       ->setHeader(pht('Answer Summary Preview'))
       ->setControlID('answerWiki')
       ->setPreviewURI($this->getApplicationURI('preview/'));
 
     $crumbs = $this->buildApplicationCrumbs();
 
     $id = $question->getID();
     if ($id) {
       $crumbs->addTextCrumb("Q{$id}", "/Q{$id}");
       $crumbs->addTextCrumb(pht('Edit'));
       $title = pht('Edit Question');
+      $header = id(new PHUIHeaderView())
+        ->setHeader($title)
+        ->setHeaderIcon('fa-pencil');
     } else {
       $crumbs->addTextCrumb(pht('Ask Question'));
       $title = pht('Ask New Question');
+      $header = id(new PHUIHeaderView())
+        ->setHeader($title)
+        ->setHeaderIcon('fa-plus-square');
     }
+    $crumbs->setBorder(true);
 
-    $form_box = id(new PHUIObjectBoxView())
-      ->setHeaderText($title)
+    $box = id(new PHUIObjectBoxView())
+      ->setHeaderText(pht('Question'))
       ->setFormErrors($errors)
+      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
       ->setForm($form);
 
-    return $this->buildApplicationPage(
-      array(
-        $crumbs,
-        $form_box,
+    $view = id(new PHUITwoColumnView())
+      ->setHeader($header)
+      ->setFooter(array(
+        $box,
         $preview,
         $answer_preview,
-      ),
-      array(
-        'title'  => $title,
       ));
+
+    return $this->newPage()
+      ->setTitle($title)
+      ->setCrumbs($crumbs)
+      ->appendChild($view);
+
   }
 
 }
diff --git a/src/applications/ponder/controller/PonderQuestionHistoryController.php b/src/applications/ponder/controller/PonderQuestionHistoryController.php
index e7801ab4b1..21cc2ed064 100644
--- a/src/applications/ponder/controller/PonderQuestionHistoryController.php
+++ b/src/applications/ponder/controller/PonderQuestionHistoryController.php
@@ -1,43 +1,48 @@
 <?php
 
 final class PonderQuestionHistoryController extends PonderController {
 
   public function shouldAllowPublic() {
     return true;
   }
 
   public function handleRequest(AphrontRequest $request) {
     $viewer = $request->getViewer();
     $id = $request->getURIData('id');
 
     $question = id(new PonderQuestionQuery())
       ->setViewer($viewer)
       ->withIDs(array($id))
       ->executeOne();
     if (!$question) {
       return new Aphront404Response();
     }
 
     $timeline = $this->buildTransactionTimeline(
       $question,
       new PonderQuestionTransactionQuery());
     $timeline->setShouldTerminate(true);
 
     $qid = $question->getID();
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->setBorder(true);
     $crumbs->addTextCrumb("Q{$qid}", "/Q{$qid}");
     $crumbs->addTextCrumb(pht('History'));
+    $crumbs->setBorder(true);
+
+    $header = id(new PHUIHeaderView())
+      ->setHeader($question->getTitle())
+      ->setHeaderIcon('fa-history');
+
+    $view = id(new PHUITwoColumnView())
+      ->setHeader($header)
+      ->setFooter($timeline);
 
-    return $this->buildApplicationPage(
-      array(
-        $crumbs,
-        $timeline,
-      ),
-      array(
-        'title' => pht('Question History'),
-      ));
+    return $this->newPage()
+      ->setTitle(pht('Question History'))
+      ->setCrumbs($crumbs)
+      ->appendChild($view);
   }
 
 }