diff --git a/index.js b/index.js
index aa6e02b5cf1bd9062b2faa43893fdc6eea5d489b..0a842a510a22c442132c792c397c39b0e0fce6cf 100755
--- a/index.js
+++ b/index.js
@@ -19,7 +19,7 @@ cli.main(function(args, options) {
 var sitegin = function(config) {
   var options = config.options;
   require('./sitegin/sitegin')({
-    watch: !options.noserver
+    watch: !options.noserver && !options.nowatch
   })
   .then(function onLoad(jobs) {
     var sass = require('node-sass');
@@ -88,14 +88,16 @@ var sitegin = function(config) {
 
       var chokidar = require('chokidar');
       // article or theme reload
-      var watches = [path.join(config.sourceDir,'articles'),config.themeDir];
-      console.log('Watching',watches,'for changes');
-      chokidar.watch(watches, {ignoreInitial: true})
-      .on('all', function(event, path) {
-        console.log('Content or theme changed. Rebuilding...');
-        console.log('Change event:',event,'on path:',path);
-        run();
-      })
+      if(!options.nowatch) {
+        var watches = [path.join(config.sourceDir,'articles'),config.themeDir];
+        console.log('Watching',watches,'for changes');
+        chokidar.watch(watches, {ignoreInitial: true})
+        .on('all', function(event, path) {
+          console.log('Content or theme changed. Rebuilding...');
+          console.log('Change event:',event,'on path:',path);
+          run();
+        })
+      }
 
       // sitegin reload
       jobs.onReload(function() {
diff --git a/sitegin/config.js b/sitegin/config.js
index 6d5ce9e1aeca09bee712f471155813d8fb76dcd3..ac876304ec5342004a97d8a04fe88f96a1e4ef3c 100644
--- a/sitegin/config.js
+++ b/sitegin/config.js
@@ -20,6 +20,7 @@ var options = cli.parse({
  builddir: [null, 'Allows to specify arbitrary content directory.', 'string', null],
  staticdir: [null, 'Allows to specify arbitrary directory for static files.', 'string', 'static'],
  baseurl: [null, 'BaseURL without trailing /', 'string', ''],
+ nowatch: [null, 'Disable watching for changes'],
  debugarticle: [null, 'Article for which extra information should be printed out. Full file path '+
  'relative to contentdir (Ex. articles/2010/hello-word.md)','string', null]
 });
diff --git a/theme/templates/partials/base.html.nunj b/theme/templates/partials/base.html.nunj
index a7715304718cec9e792ec01858b9ae5ad45c7a23..956b3da8a0eaadad010f22793dde160e616e10dc 100644
--- a/theme/templates/partials/base.html.nunj
+++ b/theme/templates/partials/base.html.nunj
@@ -58,6 +58,9 @@
             <a class="hide-on-small-only left" id="o-nas">
               O nás
             </a>
+            <a class="hide-on-small-only left" id="o-nas">
+              Aktuality
+            </a>
             <a class="hide-on-small-only left" id="clanky">
               Články
             </a>
@@ -101,17 +104,27 @@
           <li><a href="{{ config.baseurl }}/clanek/o-radioklubu">O Radioklubu</a></li>
           <li><a href="{{ config.baseurl }}/clanek/kontakt">Kontakt</a></li>
           <li><a href="{{ config.baseurl }}/clanek/krouzek-mladeze">Kroužek mládeže</a></li>
-          <li><a href="{{ config.baseurl }}/clanek/podporuji-nas">Podporují nás</a></li>
           <li><a href="{{ config.baseurl }}/clanek/pro-cleny-rk">Pro ÄŤleny RK</a></li>
         </ul></div>
       </li>
       <li class="no-padding">
-        <a class="collapsible-header waves-effect waves-teal">Články</a>
+        <a class="collapsible-header waves-effect waves-teal">Aktuality</a>
         <div class="collapsible-body"><ul>
-          <li><a href="{{ config.baseurl }}/tag/clanek">Všechny články</a></li>
+          <li><a href="{{ config.baseurl }}/tag/aktuality">Všechny aktuality</a></li>
+          <li><a href="{{ config.baseurl }}/tag/pozvanky">Pozvánky</a></li>
+          <li><a href="{{ config.baseurl }}/tag/stalo-se">Stalo se</a></li>
           <li><a href="{{ config.baseurl }}/tag/zavody">Závody</a></li>
-          <li><a href="{{ config.baseurl }}/tag/bastleni">BastlenĂ­</a></li>
+        </ul></div>
+      </li>
+      <li class="no-padding">
+        <a class="collapsible-header waves-effect waves-teal">Články</a>
+        <div class="collapsible-body"><ul>
+          <li><a href="{{ config.baseurl }}/tag/clanky">Všechny články</a></li>
           <li><a href="{{ config.baseurl }}/tag/programovani">Programování</a></li>
+          <li><a href="{{ config.baseurl }}/tag/mikroprocesory">Mikroprocesory</a></li>
+          <li><a href="{{ config.baseurl }}/tag/konstrukce">Konstrukce</a></li>
+          <li><a href="{{ config.baseurl }}/tag/technicke-clanky">Technické články</a></li>
+          <li><a href="{{ config.baseurl }}/tag/zajimavosti">ZajĂ­mavosti</a></li>
         </ul></div>
       </li>
     </ul>
@@ -123,19 +136,31 @@
           <li><a href="{{ config.baseurl }}/clanek/o-radioklubu">O Radioklubu</a></li>
           <li><a href="{{ config.baseurl }}/clanek/kontakt">Kontakt</a></li>
           <li><a href="{{ config.baseurl }}/clanek/krouzek-mladeze">Kroužek mládeže</a></li>
-          <li><a href="{{ config.baseurl }}/clanek/podporuji-nas">Podporují nás</a></li>
           <li><a href="{{ config.baseurl }}/clanek/pro-cleny-rk">Pro ÄŤleny RK</a></li>
         </ul>
       </div>
     </nav>
-    <!-- Lower nav 2 -->
-    <nav class="subnav subnav2 hide-on-small-and-down" role="navigation">
+    <!-- Lower nav 2 - Aktuality -->
+    <nav class="subnav subnav1 hide-on-small-and-down" role="navigation">
       <div class="nav-wrapper container">
         <ul class="right">
-          <li><a href="{{ config.baseurl }}/tag/clanek">Všechny články</a></li>
+          <li><a href="{{ config.baseurl }}/tag/aktuality">Všechny aktuality</a></li>
+          <li><a href="{{ config.baseurl }}/tag/pozvanky">Pozvánky</a></li>
+          <li><a href="{{ config.baseurl }}/tag/stalo-se">Stalo se</a></li>
           <li><a href="{{ config.baseurl }}/tag/zavody">Závody</a></li>
-          <li><a href="{{ config.baseurl }}/tag/bastleni">BastlenĂ­</a></li>
+        </ul>
+      </div>
+    </nav>
+    <!-- Lower nav 3 - Články -->
+    <nav class="subnav subnav2 hide-on-small-and-down" role="navigation">
+      <div class="nav-wrapper container">
+        <ul class="right">
+          <li><a href="{{ config.baseurl }}/tag/clanky">Všechny články</a></li>
           <li><a href="{{ config.baseurl }}/tag/programovani">Programování</a></li>
+          <li><a href="{{ config.baseurl }}/tag/mikroprocesory">Mikroprocesory</a></li>
+          <li><a href="{{ config.baseurl }}/tag/konstrukce">Konstrukce</a></li>
+          <li><a href="{{ config.baseurl }}/tag/technicke-clanky">Technické články</a></li>
+          <li><a href="{{ config.baseurl }}/tag/zajimavosti">ZajĂ­mavosti</a></li>
         </ul>
       </div>
     </nav>
@@ -158,7 +183,7 @@
           </div>
         </div>
         <div class="container s6">
-        Stránky pro OK1KVK vytvořil <a class="orange-text text-lighten-3" target="_blank" href="https://blog.skorepa.info">Jakub Skořepa</a> 2015-2016
+        Stránky pro OK1KVK vytvořil <a class="orange-text text-lighten-3" target="_blank" href="https://blog.skorepa.info">Jakub Skořepa</a> 2015-2017
         </div>
     </footer>
 
diff --git a/theme/templates/partials/list.html.nunj b/theme/templates/partials/list.html.nunj
index c0ba0519ea980f2b7dcf56ee8c7f6eeae408c254..6cc528fad169d3b95e084d7eca4d87f2c66d7d11 100644
--- a/theme/templates/partials/list.html.nunj
+++ b/theme/templates/partials/list.html.nunj
@@ -85,7 +85,7 @@
       $(window).resize(onresize);
       $(document).load(onresize);
       $(document).ready(onresize);
-      $(document).keypress(function(e) {
+      $(document).keyup(function(e) {
         if($("#search-overlay").hasClass("shown")) return;
         if(e.key == "ArrowRight") window.location = "{{config.baseurl}}/{{metadata.nexturl}}";
         if(e.key == "ArrowLeft") window.location = "{{config.baseurl}}/{{metadata.prevurl}}";