diff --git a/Controller.js b/Controller.js
index 6b55964..301b313 100644
--- a/Controller.js
+++ b/Controller.js
@@ -101,7 +101,7 @@ jsOMS.Modules.Navigation = class {
         });
 
         // Bind show/hide
-        e.nextElementSibling.addEventListener('change', function () {
+        e.addEventListener('change', function () {
             self.navigation[e.id].setVisible(this.checked);
             localStorage.setItem(Navigation.MODULE_NAME, JSON.stringify(self.navigation));
         });
diff --git a/Theme/Backend/top.tpl.php b/Theme/Backend/top.tpl.php
index f4d3d12..178839d 100644
--- a/Theme/Backend/top.tpl.php
+++ b/Theme/Backend/top.tpl.php
@@ -10,14 +10,16 @@
  * @version    1.0.0
  * @link       http://website.orange-management.de
  */
+
+use Modules\Navigation\Models\NavigationType;
+
 /**
  * @var \Modules\Navigation\Views\NavigationView $this
  */
-if (isset($this->nav[\Modules\Navigation\Models\NavigationType::TOP])): ?>
+if (isset($this->nav[NavigationType::TOP])): ?>
     <ul id="t-nav" role="navigation">
-
         <?php $unread = $this->getData('unread');
-        foreach ($this->nav[\Modules\Navigation\Models\NavigationType::TOP] as $key => $parent) :
+        foreach ($this->nav[NavigationType::TOP] as $key => $parent) :
         foreach ($parent as $link) : ?>
         <li><a href="<?= \phpOMS\Uri\UriFactory::build($link['nav_uri']); ?>">
 
@@ -25,9 +27,8 @@ if (isset($this->nav[\Modules\Navigation\Models\NavigationType::TOP])): ?>
                     <i class="<?= $this->printHtml($link['nav_icon']); ?> infoIcon"><?php if (isset($unread[$link['nav_from']]) && $unread[$link['nav_from']] > 0) : ?><span class="badge"><?= $this->printHtml($unread[$link['nav_from']]); ?></span><?php endif; ?></i>
                 <?php endif; ?>
 
-                <?= $this->getHtml($link['nav_name'], 'Navigation') ?></a>
+                <span class="link"><?= $this->getHtml($link['nav_name'], 'Navigation') ?><span></a>
             <?php endforeach;
             endforeach; ?>
-
     </ul>
 <?php endif;