diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index b60ae0a31..3861d3f1b 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -377,12 +377,12 @@ class Monitoring_ListController extends Controller
         ));
     }
 
-    public function statehistorysummaryAction()
+    public function eventgridAction()
     {
         if ($url = $this->hasBetterUrl()) {
             return $this->redirectNow($url);
         }
-        $this->addTitleTab('statehistorysummary', 'State Summary');
+        $this->addTitleTab('eventgrid', t('Event Grid'));
 
         $form = new StatehistoryForm();
         $form->setEnctype(Zend_Form::ENCTYPE_URLENCODED);
@@ -406,7 +406,7 @@ class Monitoring_ListController extends Controller
         $orientationBox->applyRequest($this->getRequest());
 
         $query = $this->backend->select()->from(
-            'stateHistorySummary',
+            'eventgrid',
             array('day', $form->getValue('state'))
         );
         $this->params->remove(array('objecttype', 'from', 'to', 'state', 'btn_submit'));
@@ -549,8 +549,8 @@ class Monitoring_ListController extends Controller
         if ($url = $this->hasBetterUrl()) {
             return $this->redirectNow($url);
         }
+        $this->addTitleTab('eventhistory', $this->translate('Event Overview'));
 
-        $this->addTitleTab('eventhistory');
         $query = $this->backend->select()->from('eventHistory', array(
             'host_name',
             'service_description',
@@ -710,7 +710,7 @@ class Monitoring_ListController extends Controller
             'hosts',
             'services',
             'eventhistory',
-            'statehistorysummary',
+            'eventgrid',
             'notifications'
         ))) {
             $tabs->extend(new OutputFormat())->extend(new DashboardAction());
diff --git a/modules/monitoring/application/controllers/TimelineController.php b/modules/monitoring/application/controllers/TimelineController.php
index e57943aa6..e21c580ad 100644
--- a/modules/monitoring/application/controllers/TimelineController.php
+++ b/modules/monitoring/application/controllers/TimelineController.php
@@ -14,8 +14,20 @@ use Icinga\Module\Monitoring\Web\Widget\SelectBox;
 
 class Monitoring_TimelineController extends Controller
 {
+    protected function addTitleTab($action, $title = false)
+    {
+        $title = $title ? : ucfirst($action);
+        $this->getTabs()->add($action, array(
+            'title' => $title,
+            'url' => Url::fromRequest()
+        ))->activate($action);
+        $this->view->title = $title;
+    }
+
     public function indexAction()
     {
+        $this->addTitleTab('index', t('Timeline'));
+
         // TODO: filter for hard_states (precedence adjustments necessary!)
         $this->setupIntervalBox();
         list($displayRange, $forecastRange) = $this->buildTimeRanges();
diff --git a/modules/monitoring/application/forms/StatehistoryForm.php b/modules/monitoring/application/forms/StatehistoryForm.php
index bcadeeb66..f269cb0cd 100644
--- a/modules/monitoring/application/forms/StatehistoryForm.php
+++ b/modules/monitoring/application/forms/StatehistoryForm.php
@@ -9,7 +9,7 @@ use Icinga\Web\Form;
 use Icinga\Data\Filter\Filter;
 
 /**
- * Configure the filter for the statehistorysummary
+ * Configure the filter for the event grid
  */
 class StatehistoryForm extends Form
 {
diff --git a/modules/monitoring/application/views/scripts/list/statehistorysummary.phtml b/modules/monitoring/application/views/scripts/list/eventgrid.phtml
similarity index 99%
rename from modules/monitoring/application/views/scripts/list/statehistorysummary.phtml
rename to modules/monitoring/application/views/scripts/list/eventgrid.phtml
index eb65b779e..1bd13a2b1 100644
--- a/modules/monitoring/application/views/scripts/list/statehistorysummary.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventgrid.phtml
@@ -11,6 +11,7 @@ use Icinga\Web\Widget\Chart\HistoryColorGrid;
             <br />
             <?= $form ?>
         </div>
+        <br />
         <?php if (! $this->filterEditor): ?>
             <?= $this->filterPreview ?>
         <?php endif ?>
diff --git a/modules/monitoring/configuration.php b/modules/monitoring/configuration.php
index 848d213bb..63dfaf3e6 100644
--- a/modules/monitoring/configuration.php
+++ b/modules/monitoring/configuration.php
@@ -110,15 +110,12 @@ $section->add($this->translate('Contacts'), array(
 $section = $this->menuSection($this->translate('History'), array(
     'icon'      => 'img/icons/history.png'
 ));
-$section->add($this->translate('Critical Events'), array(
-    'url'      => 'monitoring/list/statehistorysummary',
+$section->add($this->translate('Event Grid'), array(
+    'url'      => 'monitoring/list/eventgrid',
     'priority' => 50
 ));
-$section->add($this->translate('Notifications'), array(
-    'url'      => 'monitoring/list/notifications'
-));
 $section->add($this->translate('Events'), array(
-    'title'    => $this->translate('All Events'),
+    'title'    => $this->translate('Event Overview'),
     'url'      => 'monitoring/list/eventhistory?timestamp>=-7%20days'
 ));
 $section->add($this->translate('Timeline'))->setUrl('monitoring/timeline');
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StateHistorySummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php
similarity index 98%
rename from modules/monitoring/library/Monitoring/Backend/Ido/Query/StateHistorySummaryQuery.php
rename to modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php
index 9004d5250..88a120db2 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StateHistorySummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/EventgridQuery.php
@@ -4,7 +4,7 @@
 
 namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
-class StateHistorySummaryQuery extends IdoQuery
+class EventgridQuery extends IdoQuery
 {
     protected $columnMap = array(
         'statehistory' => array(
diff --git a/modules/monitoring/library/Monitoring/DataView/StateHistorySummary.php b/modules/monitoring/library/Monitoring/DataView/Eventgrid.php
similarity index 95%
rename from modules/monitoring/library/Monitoring/DataView/StateHistorySummary.php
rename to modules/monitoring/library/Monitoring/DataView/Eventgrid.php
index 0c7ca68a5..726f1ae60 100644
--- a/modules/monitoring/library/Monitoring/DataView/StateHistorySummary.php
+++ b/modules/monitoring/library/Monitoring/DataView/Eventgrid.php
@@ -4,7 +4,7 @@
 
 namespace Icinga\Module\Monitoring\DataView;
 
-class StateHistorySummary extends DataView
+class Eventgrid extends DataView
 {
     /**
      * Retrieve columns provided by this view