diff --git a/application/layouts/scripts/body.phtml b/application/layouts/scripts/body.phtml
index 222762bb5..df2153cc7 100644
--- a/application/layouts/scripts/body.phtml
+++ b/application/layouts/scripts/body.phtml
@@ -23,14 +23,14 @@ if ($notifications->hasMessages()) {
     }
 }
    ?></ul>
-   <div id="logo" data-base-target="_main"><a href="<?= $this->href('/dashboard') ?>"><img src="<?= $this->href('img/logo_icinga-inv.png') ?>" class="logo" /></a>
+   <div id="logo" data-base-target="_main"><a href="<?= $this->href('/dashboard') ?>"><img src="<?= $this->href('img/logo_icinga-inv.png') ?>" class="logo" alt="<?= t('Dashboard') ?>" /></a>
  </div>
  </div>
 
  <div id="sidebar">
   <?php echo $this->render('parts/navigation.phtml') ?>
  </div>
- <div id="main">
+ <div id="main" role="main">
   <div id="col1" class="container<?= $moduleClass ?>"<?php if ($moduleName): ?> data-icinga-module="<?= $moduleName ?>" <?php endif ?> data-icinga-url="<?= Url::fromRequest() ?>" style="display: block">
    <?= $this->render('inline.phtml') ?>
   </div>
diff --git a/application/layouts/scripts/parts/menu.phtml b/application/layouts/scripts/parts/menu.phtml
index 7174ddd8e..7a4f84ef3 100644
--- a/application/layouts/scripts/parts/menu.phtml
+++ b/application/layouts/scripts/parts/menu.phtml
@@ -1,4 +1,9 @@
-<ul>
+<?php
+if (! $this->level) {
+    $this->level = 0;
+}
+?>
+<ul<?= $this->level === 0 ? ' role="navigation"' : '' ?>>
 <?php
 
 foreach ($this->items as $item) {
@@ -17,7 +22,7 @@ foreach ($this->items as $item) {
     if ($item->hasChildren()) {
         echo $this->partial(
             'parts/menu.phtml',
-            array('items' => $item->getChildren(), 'url' => $this->url)
+            array('items' => $item->getChildren(), 'url' => $this->url, 'level' => $this->level + 1)
         );
     }
 
diff --git a/application/layouts/scripts/parts/navigation.phtml b/application/layouts/scripts/parts/navigation.phtml
index 0e47d5358..05d9582ce 100644
--- a/application/layouts/scripts/parts/navigation.phtml
+++ b/application/layouts/scripts/parts/navigation.phtml
@@ -13,7 +13,7 @@ $url = Url::fromRequest()->remove('_render')->getRelativeUrl();
 $menu = Menu::fromConfig();
 ?>
 <div id="menu" data-base-target="_main">
-  <form action="<?= $this->href('search') ?>" method="get">
+  <form action="<?= $this->href('search') ?>" method="get" role="search">
     <input type="text" name="q" class="search autofocus" placeholder="<?= $this->translate('Search...') ?>" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" />
   </form>
 <?= $this->partial('parts/menu.phtml', array(