diff --git a/templates/Content.php b/templates/Content.php
index 96d2dd8..02c2216 100644
--- a/templates/Content.php
+++ b/templates/Content.php
@@ -4,7 +4,9 @@
 <div id="app-content">
     <!-- app-content-wrapper is optional, only use if app-content-list  -->
     <div id="app-content-wrapper">
-        <?php print_unescaped($this->inc('contentTable'));?>
+        <div class="ncdownloader-body-wrapper">
+            <div id="ncdownloader-form-container" class="ncdownloader-form-container"></div>
+            <div id="ncdownloader-table-wrapper" class="table" type="active-downloads"></div>
+        </div>
     </div>
-    <div id="ncdownloader-action-links-container"></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/templates/Index.php b/templates/Index.php
index a0ca4b8..31fd840 100644
--- a/templates/Index.php
+++ b/templates/Index.php
@@ -1,4 +1,4 @@
-<div id="ncdownloader-content">
+<div id="app-ncdownloader-wrapper">
     <?php print_unescaped($this->inc('Navigation'));?>
     <?php print_unescaped($this->inc('Content'));?>
 </div>
diff --git a/templates/Navigation.php b/templates/Navigation.php
index 7076052..3fd606c 100644
--- a/templates/Navigation.php
+++ b/templates/Navigation.php
@@ -5,19 +5,9 @@ $aria2_installed = $_['aria2_installed'];
 
 ?>
 <div id="app-navigation">
-    <div class="app-navigation-new" id="new-download"  data-inputbox="form-input-wrapper">
+    <div class="app-navigation-new" id="search-download"  data-inputbox="form-input-wrapper">
         <button type="button" class="icon-add">
-            <?php print($l->t('Add Download'));?>
-        </button>
-    </div>
-    <div class="app-navigation-new" id="new-download-ytdl" data-inputbox="form-input-wrapper">
-        <button type="button" class="icon-add <?php $youtube_installed ? print "installed" : print "notinstalled";?>">
-            <?php $youtube_installed ? print($l->t('YTDL Download')) : print $l->t('Youtube-dl NOT installed!');?>
-        </button>
-    </div>
-    <div class="app-navigation-new" id="torrent-search-button"  data-inputbox="form-input-wrapper">
-        <button type="button" class="icon-search">
-            <?php print $l->t('Search torrents');?>
+            <?php print($l->t('Download & Search'));?>
         </button>
     </div>
     <div class="app-navigation-new" id="start-aria2">
@@ -41,65 +31,65 @@ $aria2_installed = $_['aria2_installed'];
     <ul>
         <li class="active-downloads">
             <div class="app-navigation-entry-bullet"></div>
-            <a href="/apps/ncdownloader/dl/active">
+            <a  role="button" tabindex="0" path="/apps/ncdownloader/dl/active">
                 <?php print($l->t('Active Downloads'));?>
             </a>
             <div class="app-navigation-entry-utils">
                 <ul>
                     <li class="app-navigation-entry-utils-counter" id="active-downloads-counter">
-                        <div class="number">0</div>
+                        <div class="number"><?php print($_['counter']['active']);?></div>
                     </li>
                 </ul>
             </div>
         </li>
         <li class="waiting-downloads">
             <div class="app-navigation-entry-bullet"></div>
-            <a href="/apps/ncdownloader/dl/waiting">
+            <a  role="button" tabindex="0" path="/apps/ncdownloader/dl/waiting">
                 <?php print($l->t('Waiting Downloads'));?>
             </a>
             <div class="app-navigation-entry-utils">
                 <ul>
                     <li class="app-navigation-entry-utils-counter" id="waiting-downloads-counter">
-                        <div class="number">0</div>
+                        <div class="number"><?php print($_['counter']['waiting']);?></div>
                     </li>
                 </ul>
             </div>
         </li>
         <li class="complete-downloads">
             <div class="app-navigation-entry-bullet"></div>
-            <a href="/apps/ncdownloader/dl/complete">
+            <a  role="button" tabindex="0" path="/apps/ncdownloader/dl/complete">
                 <?php print($l->t('Complete Downloads'));?>
             </a>
             <div class="app-navigation-entry-utils">
                 <ul>
                     <li class="app-navigation-entry-utils-counter" id="complete-downloads-counter">
-                        <div class="number">0</div>
+                        <div class="number"><?php print($_['counter']['complete']);?></div>
                     </li>
                 </ul>
             </div>
         </li>
         <li class="fail-downloads">
             <div class="app-navigation-entry-bullet"></div>
-            <a href="/apps/ncdownloader/dl/fail">
+            <a  role="button" tabindex="0" path="/apps/ncdownloader/dl/fail">
                 <?php print($l->t('Failed Downloads'));?>
             </a>
             <div class="app-navigation-entry-utils">
                 <ul>
                     <li class="app-navigation-entry-utils-counter" id="fail-downloads-counter">
-                        <div class="number">0</div>
+                        <div class="number"><?php print($_['counter']['fail']);?></div>
                     </li>
                 </ul>
             </div>
         </li>
         <li class="youtube-dl-downloads">
             <div class="app-navigation-entry-bullet"></div>
-            <a href="/apps/ncdownloader/youtube/get">
+            <a role="button" tabindex="0">
                 <?php print($l->t('Youtube-dl Downloads'));?>
             </a>
             <div class="app-navigation-entry-utils">
                 <ul>
                     <li class="app-navigation-entry-utils-counter" id="youtube-dl-downloads-counter">
-                        <div class="number">0</div>
+                        <div class="number"><?php print($_['counter']['youtube-dl']);?></div>
                     </li>
                 </ul>
             </div>
diff --git a/templates/contentTable.php b/templates/contentTable.php
deleted file mode 100644
index e9d72e7..0000000
--- a/templates/contentTable.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-?>
-<div class="ncdownloader-content-wrapper">
-    <div id="ncdownloader-form-wrapper"> </div>
-    <table id="ncdownloader-table-content" type="active-downloads">
-    </table>
-    <div id="ncdownloader-table-wrapper" class="table" type="active-downloads"></div>
-</div>
\ No newline at end of file