Index: src/applications/calendar/controller/PhabricatorCalendarBrowseController.php
===================================================================
--- src/applications/calendar/controller/PhabricatorCalendarBrowseController.php
+++ src/applications/calendar/controller/PhabricatorCalendarBrowseController.php
@@ -57,10 +57,15 @@
       $month_view->addEvent($event);
     }
 
+    $date = new DateTime("{$year}-{$month}-01");
+    $crumbs = $this->buildApplicationCrumbs();
+    $crumbs->addTextCrumb($date->format('F Y'));
+
     $nav = $this->buildSideNavView();
     $nav->selectFilter('/');
     $nav->appendChild(
       array(
+        $crumbs,
         $this->getNoticeView(),
         $month_view,
       ));
Index: src/applications/calendar/controller/PhabricatorCalendarController.php
===================================================================
--- src/applications/calendar/controller/PhabricatorCalendarController.php
+++ src/applications/calendar/controller/PhabricatorCalendarController.php
@@ -9,14 +9,30 @@
 
     $nav->addLabel(pht('Calendar'));
     $nav->addFilter('/', pht('View All'));
-    $nav->addFilter('event/create/', pht('New Status'));
+    $nav->addFilter('event/create/', pht('Create Event'));
 
     if ($status && $status->getID()) {
-      $nav->addFilter('event/edit/'.$status->getID().'/', pht('Edit Status'));
+      $nav->addFilter('event/edit/'.$status->getID().'/', pht('Edit Event'));
     }
-    $nav->addFilter('event/', pht('Upcoming Statuses'));
+    $nav->addFilter('event/', pht('Upcoming Events'));
 
     return $nav;
   }
 
+  public function buildApplicationMenu() {
+    return $this->buildSideNavView()->getMenu();
+  }
+
+  public function buildApplicationCrumbs() {
+    $crumbs = parent::buildApplicationCrumbs();
+
+    $crumbs->addAction(
+      id(new PHUIListItemView())
+        ->setName(pht('Create Event'))
+        ->setHref($this->getApplicationURI().'event/create')
+        ->setIcon('create'));
+
+    return $crumbs;
+  }
+
 }
Index: src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
===================================================================
--- src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
+++ src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
@@ -166,6 +166,8 @@
     }
     $form->appendChild($submit);
 
+
+
     $form_box = id(new PHUIObjectBoxView())
       ->setHeaderText($page_title)
       ->setFormErrors($errors)
@@ -174,8 +176,13 @@
     $nav = $this->buildSideNavView($status);
     $nav->selectFilter($filter);
 
+    $crumbs = $this
+      ->buildApplicationCrumbs()
+      ->addTextCrumb($page_title);
+
     $nav->appendChild(
       array(
+        $crumbs,
         $form_box,
       ));
 
Index: src/applications/calendar/controller/PhabricatorCalendarEventListController.php
===================================================================
--- src/applications/calendar/controller/PhabricatorCalendarEventListController.php
+++ src/applications/calendar/controller/PhabricatorCalendarEventListController.php
@@ -34,18 +34,6 @@
     return $nav;
   }
 
-  public function buildApplicationCrumbs() {
-    $crumbs = parent::buildApplicationCrumbs();
-
-    $crumbs->addAction(
-      id(new PHUIListItemView())
-        ->setIcon('create')
-        ->setName(pht('Create Event'))
-        ->setHref($this->getApplicationURI().'create/'));
-
-    return $crumbs;
-  }
-
   public function renderResultsList(
     array $events,
     PhabricatorSavedQuery $query) {
Index: src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
===================================================================
--- src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
+++ src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
@@ -1,7 +1,7 @@
 <?php
 
 final class PhabricatorCalendarEventViewController
-  extends PhabricatorDashboardController {
+  extends PhabricatorCalendarController {
 
   private $id;
 
Index: src/applications/calendar/storage/PhabricatorCalendarEvent.php
===================================================================
--- src/applications/calendar/storage/PhabricatorCalendarEvent.php
+++ src/applications/calendar/storage/PhabricatorCalendarEvent.php
@@ -48,9 +48,9 @@
   public function getTerseSummary(PhabricatorUser $viewer) {
     $until = phabricator_date($this->dateTo, $viewer);
     if ($this->status == PhabricatorCalendarEvent::STATUS_SPORADIC) {
-      return 'Sporadic until '.$until;
+      return pht('Sporadic until %s', $until);
     } else {
-      return 'Away until '.$until;
+      return pht('Away until %s', $until);
     }
   }