diff --git a/plinth/templates/base.html b/plinth/templates/base.html
index ea822e6b9..cd1497ba4 100644
--- a/plinth/templates/base.html
+++ b/plinth/templates/base.html
@@ -95,13 +95,15 @@
               <span class="glyphicon-question-sign glyphicon nav-icon"></span>
             </a>
           </li>
+
           {% if user.is_authenticated %}
-          <li>
-            <a href="{% url 'system:index' %}">
-              <span class="glyphicon-cog glyphicon nav-icon"></span>
-            </a>
-          </li>
-          <li class="dropdown">
+            <li>
+              <a href="{% url 'system:index' %}">
+                <span class="glyphicon-cog glyphicon nav-icon"></span>
+              </a>
+            </li>
+
+            <li class="dropdown">
               <a href="{% url 'users:edit' user.username %}"
                  class="dropdown-toggle" data-toggle="dropdown"
                  role="button" aria-expanded="false">
@@ -117,13 +119,13 @@
                 <li><a href="{% url 'users:logout' %}" title="Log out">
                     Log out</a></li>
               </ul>
-          </li>
+            </li>
           {% else %}
-          <li>
-              <a href="{% url 'users:login' %}" title="Log in">
-                <i class="glyphicon glyphicon-user nav-icon"></i>
-                Log in</a>
-          </li>  
+            <li>
+                <a href="{% url 'users:login' %}" title="Log in">
+                  <i class="glyphicon glyphicon-user nav-icon"></i>
+                  Log in</a>
+            </li>
           {% endif %}
 
           {% if user.is_authenticated %}
diff --git a/plinth/templates/login.html b/plinth/templates/login.html
index 00486dca6..740fb50db 100644
--- a/plinth/templates/login.html
+++ b/plinth/templates/login.html
@@ -26,10 +26,11 @@
 
     <div class="row">
       {% csrf_token %}
-      <div class="col-sm-4 col-md-offset-2">
+      <div class="col-sm-3 col-md-offset-3">
         {{ form|bootstrap }}
+
         <div class="text-center">
-        <input type="submit" class="btn btn-primary" value="Login" />
+          <input type="submit" class="btn btn-primary" value="Login" />
         </div>
      </div>
     </div>