diff --git a/templates/partial/header.html.ep b/templates/partial/header.html.ep
index 5622d32..ac6f344 100644
--- a/templates/partial/header.html.ep
+++ b/templates/partial/header.html.ep
@@ -1,8 +1,15 @@
-<header>
+<nav class="navbar">
   <%= link_to 'index', class => 'logo', begin %><h1><span><%= title() // loc('korap_desc') %></span><% if (loc('title_addon')) { %><div class="logoaddon"><%= loc('title_addon') %></div><% } %></h1><% end %>
-  <div class="button top">
+
+  <div class="navbar-group">
     %= content_block 'headerButtonGroup'
+    %= include 'partial/auth/login'
   </div>
+
+  <div class="burger-icon"></div>
+</nav>
+
+<header>
   <form autocomplete="off" action="<%= url_for 'index' %>" id="searchform">
     <div id="searchbar">
       %= search_field 'q', id => 'q-field', autofocus => 'autofocus', placeholder => loc('searchplaceholder'), spellcheck => 'false', autocomplete => 'off', autocorrect => 'off', autocapitalize => 'off'
diff --git a/templates/partial/side.html.ep b/templates/partial/side.html.ep
index c64e275..f8d81f0 100644
--- a/templates/partial/side.html.ep
+++ b/templates/partial/side.html.ep
@@ -1,7 +1,7 @@
 % my $side_bar = content_block 'sidebar';
 
 % my $classes = '';
-%
+
 % if (length($side_bar) == 0) {
 %   if (my $nav = navigation('settings')) {
 %     $side_bar = b('<nav>' . $nav . '</nav>');
@@ -9,15 +9,22 @@
 %   };
 % }
 
+% my $is_empty_sidebar = $side_bar =~ /^\s*(<div[^>]*>\s*<\/div>\s*)*$/i;
+
+% if ($is_empty_sidebar) {
+%   $classes .= ' invisible';
+% };
+
 % if (length($side_bar) == 0 || stash('sidebar_off')) {
 %   $classes .= ' off';
 % } elsif (stash('sidebar_active')) {
 %   $classes .= ' active';
 % } elsif (stash('login_active') && !$classes) {
-%   $classes .= ' active';
+%   $classes .= ' invisible';
+% } elsif (!stash('login_active') && $side_bar =~ /<form.*class=".*login.*".*>/i) {
+%   $classes .= ' invisible';
 % };
 
-
 <aside tabindex="0" class="<%= $classes %>">
   <div>
     %= $side_bar