diff --git a/theme/templates/partials/base.html.nunj b/theme/templates/partials/base.html.nunj
index 4523fc4676da449f64a85dfa111129b38c7cd1fc..6ea4e8438599548df7d43386852433a9f95eb2d0 100644
--- a/theme/templates/partials/base.html.nunj
+++ b/theme/templates/partials/base.html.nunj
@@ -55,15 +55,15 @@
           </a>
         </div>
         <div class="toplinks">
-            <a class="hide-on-small-only left" id="o-nas">
-              O nás
-            </a>
             <a class="hide-on-small-only left" id="aktuality">
               Aktuality
             </a>
             <a class="hide-on-small-only left" id="clanky">
               Články
             </a>
+            <a class="hide-on-small-only left" id="o-nas">
+              O nás
+            </a>
             <a class="search-icon left">
               {{ svgs.search("#fff",false) }}
             </a>
@@ -109,15 +109,6 @@
     </script>
     <!-- Side nav -->
     <ul id="nav-mobile" class="side-nav collapsible">
-      <li class="no-padding">
-        <a class="collapsible-header waves-effect waves-teal">O nás</a>
-        <div class="collapsible-body"><ul>
-          <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/pro-cleny-rk">Pro ÄŤleny RK</a></li>
-        </ul></div>
-      </li>
       <li class="no-padding">
         <a class="collapsible-header waves-effect waves-teal">Aktuality</a>
         <div class="collapsible-body"><ul>
@@ -138,6 +129,15 @@
           <li><a href="{{ config.baseurl }}/tag/zajimavosti">ZajĂ­mavosti</a></li>
         </ul></div>
       </li>
+      <li class="no-padding">
+        <a class="collapsible-header waves-effect waves-teal">O nás</a>
+        <div class="collapsible-body"><ul>
+          <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/pro-cleny-rk">Pro ÄŤleny RK</a></li>
+        </ul></div>
+      </li>
     </ul>
 
     <!-- Lower nav -->
diff --git a/theme/templates/partials/list.html.nunj b/theme/templates/partials/list.html.nunj
index 6cc528fad169d3b95e084d7eca4d87f2c66d7d11..a69b000a24d32ca63898c8f72e5c95bdae5c6a93 100644
--- a/theme/templates/partials/list.html.nunj
+++ b/theme/templates/partials/list.html.nunj
@@ -87,8 +87,12 @@
       $(document).ready(onresize);
       $(document).keyup(function(e) {
         if($("#search-overlay").hasClass("shown")) return;
+        {% if metadata.nexturl %}
         if(e.key == "ArrowRight") window.location = "{{config.baseurl}}/{{metadata.nexturl}}";
+        {% endif %}
+        {% if metadata.prevurl %}
         if(e.key == "ArrowLeft") window.location = "{{config.baseurl}}/{{metadata.prevurl}}";
+        {% endif %}
       });
     })(jQuery);
     </script>