diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php b/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
index 78e25fe563..c1c1a8028c 100644
--- a/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
+++ b/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
@@ -1,203 +1,207 @@
 <?php
 
 final class PhabricatorCalendarEventEditController
   extends PhabricatorCalendarController {
 
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->id = idx($data, 'id');
   }
 
   public function isCreate() {
     return !$this->id;
   }
 
   public function processRequest() {
     $request  = $this->getRequest();
     $user     = $request->getUser();
 
     $start_time = id(new AphrontFormDateControl())
       ->setUser($user)
       ->setName('start')
       ->setLabel(pht('Start'))
       ->setInitialTime(AphrontFormDateControl::TIME_START_OF_DAY);
 
     $end_time = id(new AphrontFormDateControl())
       ->setUser($user)
       ->setName('end')
       ->setLabel(pht('End'))
       ->setInitialTime(AphrontFormDateControl::TIME_END_OF_DAY);
 
     if ($this->isCreate()) {
       $status       = new PhabricatorCalendarEvent();
       $end_value    = $end_time->readValueFromRequest($request);
       $start_value  = $start_time->readValueFromRequest($request);
       $submit_label = pht('Create');
       $filter       = 'status/create/';
       $page_title   = pht('Create Event');
       $redirect     = 'created';
     } else {
       $status = id(new PhabricatorCalendarEventQuery())
         ->setViewer($user)
         ->withIDs(array($this->id))
         ->requireCapabilities(
           array(
             PhabricatorPolicyCapability::CAN_VIEW,
             PhabricatorPolicyCapability::CAN_EDIT,
           ))
         ->executeOne();
       if (!$status) {
         return new Aphront404Response();
       }
 
       $end_time->setValue($status->getDateTo());
       $start_time->setValue($status->getDateFrom());
       $submit_label = pht('Update');
       $filter       = 'event/edit/'.$status->getID().'/';
       $page_title   = pht('Update Event');
       $redirect     = 'updated';
     }
 
     $errors = array();
     if ($request->isFormPost()) {
       $type        = $request->getInt('status');
       $start_value = $start_time->readValueFromRequest($request);
       $end_value   = $end_time->readValueFromRequest($request);
       $description = $request->getStr('description');
 
       if ($start_time->getError()) {
         $errors[] = pht('Invalid start time; reset to default.');
       }
       if ($end_time->getError()) {
         $errors[] = pht('Invalid end time; reset to default.');
       }
       if (!$errors) {
         try {
           $status
             ->setUserPHID($user->getPHID())
             ->setStatus($type)
             ->setDateFrom($start_value)
             ->setDateTo($end_value)
             ->setDescription($description)
             ->save();
         } catch (PhabricatorCalendarEventInvalidEpochException $e) {
           $errors[] = pht('Start must be before end.');
         }
       }
 
       if (!$errors) {
         $uri = new PhutilURI($this->getApplicationURI());
         $uri->setQueryParams(
           array(
             'month'   => phabricator_format_local_time($status->getDateFrom(),
                                                        $user,
                                                        'm'),
             'year'    => phabricator_format_local_time($status->getDateFrom(),
                                                        $user,
                                                        'Y'),
             $redirect => true,
           ));
         if ($request->isAjax()) {
           $response = id(new AphrontAjaxResponse())
             ->setContent(array('redirect_uri' => $uri));
         } else {
           $response = id(new AphrontRedirectResponse())
             ->setURI($uri);
         }
         return $response;
       }
     }
 
     $error_view = null;
     if ($errors) {
       $error_view = id(new PHUIInfoView())
         ->setTitle(pht('Status can not be set!'))
         ->setErrors($errors);
     }
 
     $status_select = id(new AphrontFormSelectControl())
       ->setLabel(pht('Status'))
       ->setName('status')
       ->setValue($status->getStatus())
       ->setOptions($status->getStatusOptions());
 
     $description = id(new AphrontFormTextAreaControl())
       ->setLabel(pht('Description'))
       ->setName('description')
       ->setValue($status->getDescription());
 
     if ($request->isAjax()) {
       $dialog = id(new AphrontDialogView())
         ->setUser($user)
         ->setTitle($page_title)
         ->setWidth(AphrontDialogView::WIDTH_FORM);
       if ($this->isCreate()) {
         $dialog->setSubmitURI($this->getApplicationURI('event/create/'));
       } else {
         $dialog->setSubmitURI(
           $this->getApplicationURI('event/edit/'.$status->getID().'/'));
       }
       $form = new PHUIFormLayoutView();
       if ($error_view) {
         $form->appendChild($error_view);
       }
     } else {
       $form = id(new AphrontFormView())
         ->setUser($user);
     }
 
     $form
       ->appendChild($status_select)
       ->appendChild($start_time)
       ->appendChild($end_time)
       ->appendChild($description);
 
     if ($request->isAjax()) {
       $dialog->addSubmitButton($submit_label);
       $submit = $dialog;
     } else {
       $submit = id(new AphrontFormSubmitControl())
         ->setValue($submit_label);
     }
     if ($this->isCreate()) {
       $submit->addCancelButton($this->getApplicationURI());
     } else {
       $submit->addCancelButton('/E'.$status->getID());
     }
 
     if ($request->isAjax()) {
       $dialog->appendChild($form);
       return id(new AphrontDialogResponse())
         ->setDialog($dialog);
     }
     $form->appendChild($submit);
 
 
 
     $form_box = id(new PHUIObjectBoxView())
       ->setHeaderText($page_title)
       ->setFormErrors($errors)
       ->setForm($form);
 
     $nav = $this->buildSideNavView($status);
     $nav->selectFilter($filter);
 
-    $crumbs = $this
-      ->buildApplicationCrumbs()
-      ->addTextCrumb($page_title);
+    $crumbs = $this->buildApplicationCrumbs();
+
+    if (!$this->isCreate()) {
+      $crumbs->addTextCrumb('E'.$status->getId(), '/E'.$status->getId());
+    }
+
+    $crumbs->addTextCrumb($page_title);
 
     $nav->appendChild(
       array(
         $crumbs,
         $form_box,
       ));
 
     return $this->buildApplicationPage(
       $nav,
       array(
         'title' => $page_title,
       ));
   }
 
 }
diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php b/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
index b72b8fbb02..cc51bd1811 100644
--- a/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
+++ b/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
@@ -1,115 +1,115 @@
 <?php
 
 final class PhabricatorCalendarEventViewController
   extends PhabricatorCalendarController {
 
   private $id;
 
   public function shouldAllowPublic() {
     return true;
   }
 
   public function willProcessRequest(array $data) {
     $this->id = $data['id'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $event = id(new PhabricatorCalendarEventQuery())
       ->setViewer($viewer)
       ->withIDs(array($this->id))
       ->executeOne();
     if (!$event) {
       return new Aphront404Response();
     }
 
-    $title = pht('Event %d', $event->getID());
+    $title = 'E'.$event->getID();
     $crumbs = $this->buildApplicationCrumbs();
-    $crumbs->addTextCrumb($title);
+    $crumbs->addTextCrumb($title, '/E'.$event->getID());
 
     $header = $this->buildHeaderView($event);
     $actions = $this->buildActionView($event);
     $properties = $this->buildPropertyView($event);
 
     $properties->setActionList($actions);
     $box = id(new PHUIObjectBoxView())
       ->setHeader($header)
       ->addPropertyList($properties);
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $box,
       ),
       array(
         'title' => $title,
       ));
   }
 
   private function buildHeaderView(PhabricatorCalendarEvent $event) {
     $viewer = $this->getRequest()->getUser();
 
     return id(new PHUIHeaderView())
       ->setUser($viewer)
       ->setHeader($event->getTerseSummary($viewer))
       ->setPolicyObject($event);
   }
 
   private function buildActionView(PhabricatorCalendarEvent $event) {
     $viewer = $this->getRequest()->getUser();
     $id = $event->getID();
 
     $actions = id(new PhabricatorActionListView())
       ->setObjectURI($this->getApplicationURI('event/'.$id.'/'))
       ->setUser($viewer);
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
       $viewer,
       $event,
       PhabricatorPolicyCapability::CAN_EDIT);
 
     $actions->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('Edit Event'))
         ->setIcon('fa-pencil')
         ->setHref($this->getApplicationURI("event/edit/{$id}/"))
         ->setDisabled(!$can_edit)
         ->setWorkflow(!$can_edit));
 
     $actions->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('Cancel Event'))
         ->setIcon('fa-times')
         ->setHref($this->getApplicationURI("event/delete/{$id}/"))
         ->setDisabled(!$can_edit)
         ->setWorkflow(true));
 
     return $actions;
   }
 
   private function buildPropertyView(PhabricatorCalendarEvent $event) {
     $viewer = $this->getRequest()->getUser();
 
     $properties = id(new PHUIPropertyListView())
       ->setUser($viewer)
       ->setObject($event);
 
     $properties->addProperty(
       pht('Starts'),
       phabricator_datetime($event->getDateFrom(), $viewer));
 
     $properties->addProperty(
       pht('Ends'),
       phabricator_datetime($event->getDateTo(), $viewer));
 
     $properties->addSectionHeader(
       pht('Description'),
       PHUIPropertyListView::ICON_SUMMARY);
     $properties->addTextContent($event->getDescription());
 
     return $properties;
   }
 
 }