diff --git a/src/applications/calendar/controller/PhabricatorCalendarBrowseController.php b/src/applications/calendar/controller/PhabricatorCalendarBrowseController.php
index 41faebe319..ad2b5e9863 100644
--- a/src/applications/calendar/controller/PhabricatorCalendarBrowseController.php
+++ b/src/applications/calendar/controller/PhabricatorCalendarBrowseController.php
@@ -51,11 +51,11 @@ final class PhabricatorCalendarBrowseController
     }
 
     $nav = $this->buildSideNavView();
-    $nav->selectFilter('edit');
+    $nav->selectFilter('/');
     $nav->appendChild(
       array(
         $this->getNoticeView(),
-        '<div style="padding: 2em;">',
+        '<div style="padding: 20px;">',
           $month_view,
         '</div>',
       ));
diff --git a/src/applications/calendar/controller/PhabricatorCalendarController.php b/src/applications/calendar/controller/PhabricatorCalendarController.php
index 8e99be9559..8ad6de4a1c 100644
--- a/src/applications/calendar/controller/PhabricatorCalendarController.php
+++ b/src/applications/calendar/controller/PhabricatorCalendarController.php
@@ -7,12 +7,10 @@ abstract class PhabricatorCalendarController extends PhabricatorController {
     $nav = new AphrontSideNavFilterView();
     $nav->setBaseURI(new PhutilURI($this->getApplicationURI()));
 
-    $nav->addFilter('', pht('Calendar'), $this->getApplicationURI());
-
-    $nav->addLabel(pht('Create Events'));
+    $nav->addLabel(pht('Calendar'));
+    $nav->addFilter('/', pht('View All'));
     $nav->addFilter('status/create/', pht('New Status'));
 
-    $nav->addLabel(pht('Your Events'));
     if ($status && $status->getID()) {
       $nav->addFilter('status/edit/'.$status->getID().'/', pht('Edit Status'));
     }
diff --git a/src/applications/calendar/controller/PhabricatorCalendarEditStatusController.php b/src/applications/calendar/controller/PhabricatorCalendarEditStatusController.php
index 75afcb3d41..7c42169f66 100644
--- a/src/applications/calendar/controller/PhabricatorCalendarEditStatusController.php
+++ b/src/applications/calendar/controller/PhabricatorCalendarEditStatusController.php
@@ -125,7 +125,7 @@ final class PhabricatorCalendarEditStatusController
     } else {
       $submit->addCancelButton(
         $this->getApplicationURI('status/delete/'.$status->getID().'/'),
-        'Delete Status'
+        pht('Delete Status')
       );
     }
     $form->appendChild($submit);