diff --git a/htroot/Settings_p.html b/htroot/Settings_p.html
index 7219e2e65..b26ba33de 100644
--- a/htroot/Settings_p.html
+++ b/htroot/Settings_p.html
@@ -12,12 +12,6 @@
     but <strong>forgot your administration password</strong>, you must stop the proxy,
     delete the file 'DATA/SETTINGS/yacy.conf' in the YaCy application root folder and start YaCy again.
     </p>
-    <ul class="settingsMenu">
-      <li><a href="PerformanceQueues_p.html">Performance Settings of Busy Queues</a></li>
-    </ul>
-    <ul class="settingsMenu">
-      <li><a href="Tables_p.html">Viewer and administration for database tables</a></li>
-    </ul>
     <ul class="settingsMenu">
       <li><a href="?page=ServerAccess">Server Access Settings</a></li>
       <li><a href="?page=ProxyAccess">Proxy Access Settings</a></li>
diff --git a/htroot/Tables_p.html b/htroot/Tables_p.html
index 1ba737db2..a7e7e725d 100644
--- a/htroot/Tables_p.html
+++ b/htroot/Tables_p.html
@@ -36,7 +36,7 @@ document.write("<div id=\"api\">\<a href=\"api/table_p.xml" + window.location.se
 </script>
 
     #%env/templates/header.template%#
-    #%env/templates/submenuTargetAnalysis.template%#
+    #%env/templates/submenuConfig.template%#
     #(showselection)#::
     <h2>Table Administration</h2>
     <form action="Tables_p.html" method="get" accept-charset="UTF-8">
diff --git a/htroot/env/templates/header.template b/htroot/env/templates/header.template
index a909b9aa3..d0b4dea79 100644
--- a/htroot/env/templates/header.template
+++ b/htroot/env/templates/header.template
@@ -97,19 +97,19 @@
       <li><a href="CrawlStartExpert.html" class="MenuItemLink">Advanced Crawler</a></li>
       <li><a href="Load_RSS_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Content Importer</a></li>
       <li><a href="Vocabulary_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Content Semantic</a></li>
-      <li><a href="Tables_p.html?table=robots&count=100" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Target Analysis</a></li>      
+      <li><a href="CrawlCheck_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Target Analysis</a></li>      
     </ul>
     <ul class="nav nav-sidebar menugroup">
       <li><h3>Administration</h3></li>
-      <li><a href="Settings_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">System Administration</a></li>
+      <li><a href="Tables_p.html?table=robots&count=100" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">System Administration</a></li>
       <li><a href="IndexControlURLs_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Index Administration</a></li>
       <li><a href="Blacklist_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Filter &amp; Blacklists</a></li>
       <li><a href="Table_API_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Process Scheduler</a></li>
     </ul>
     <ul class="nav nav-sidebar menugroup">
       <li><h3>Search Portal Integration</h3></li>
-      <li><a href="ConfigPortal.html" class="MenuItemLink">Configuration</a></li>
-      <li><a href="ConfigAppearance_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Design</a></li>
+      <li><a href="ConfigPortal.html" class="MenuItemLink">Portal Configuration</a></li>
+      <li><a href="ConfigAppearance_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Portal Design</a></li>
       <li><a href="RankingSolr_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Ranking and Heuristics</a></li>
     </ul>
     #(/navigation-advanced)#
diff --git a/htroot/env/templates/submenuConfig.template b/htroot/env/templates/submenuConfig.template
index 033e91da1..9df7f8361 100644
--- a/htroot/env/templates/submenuConfig.template
+++ b/htroot/env/templates/submenuConfig.template
@@ -1,8 +1,10 @@
 <div class="SubMenu">
   <h3>System Administration</h3>
   <ul class="SubMenu">
-    <li><a href="Settings_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Advanced Settings</a></li>
+    <li><a href="Tables_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Viewer and administration for database tables</a></li>
+    <li><a href="PerformanceQueues_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Performance Settings of Busy Queues</a></li>
     <li><a href="ConfigNetwork_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Network Configuration</a></li>
+    <li><a href="Settings_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Advanced Settings</a></li>
     <li><a href="ConfigProperties_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Advanced Properties</a></li>
   </ul>
 </div>
\ No newline at end of file
diff --git a/htroot/env/templates/submenuTargetAnalysis.template b/htroot/env/templates/submenuTargetAnalysis.template
index a3547af26..87e41efbd 100644
--- a/htroot/env/templates/submenuTargetAnalysis.template
+++ b/htroot/env/templates/submenuTargetAnalysis.template
@@ -1,7 +1,6 @@
 <div class="SubMenu">
   <h3>Target Analysis</h3>
   <ul class="SubMenu">
-    <li><a href="Tables_p.html?table=robots&count=100" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Robots.txt Database</a></li>
     <li><a href="CrawlCheck_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Mass Crawl Check</a></li>
     <li><a href="RegexTest.html" class="MenuItemLink">Regex Test</a></li>
   </ul>