diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9cad4f719..b3e0592d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ All notable changes to this project will be documented in this file.
 - config: Handle clearing of domain name.
 - letsencrypt: When no domains are configured, show better message,
   and hide diagnostics button.
+- frontpage: Fix shortcut spacing issue.
 
 ### Changed
 - repro: Use firewalld provided SIP services.
@@ -25,6 +26,8 @@ All notable changes to this project will be documented in this file.
 - frontpage: Don't show apps requiring login, unless logged in.
 - ttrss: Show status block.
 - frontpage: Make app icons larger.
+- frontpage: Center shortcut text under icons.
+- frontpage: Move info to bottom and center.
 
 ## [0.11.0] - 2016-09-21
 ### Added
diff --git a/plinth/templates/base.html b/plinth/templates/base.html
index b71811b70..7ae071e33 100644
--- a/plinth/templates/base.html
+++ b/plinth/templates/base.html
@@ -160,7 +160,7 @@
   <div class="container">
     <div class="row">
       {% block content_row %}
-        <div class="col-md-3 ">
+        <div class="col-md-3">
           {% block submenu %}
             {% if submenu %}
               <div class="sidebar">
@@ -172,7 +172,7 @@
           {% block sidebar %}
             {# this sidebar should contain help texts but no menus #}
           {% endblock %}
-        </div>
+        </div><!--/col-->
 
         <div class="col-md-9">
           {% block subsubmenu %}
@@ -187,21 +187,21 @@
             {# main content goes here #}
           {% endblock %}
         </div><!--/col-->
+
         <div class="col-md-12">
-        {% block icons %}
-          {# icons go here #}
-        {% endblock %}
-      </div>
-    </div><!--/row-->
-    {% endblock %}
-
-      <div class="text-center">
-          {% block center-header %}
-            {# this center-header should contain help texts but no menus#}
+          {% block icons %}
+            {# icons go here #}
           {% endblock %}
-      </div>
+        </div><!--/col-->
 
+      {% endblock %}
+    </div><!--/row-->
 
+    <div class="text-center">
+      {% block center-info %}
+        {# this center-info should contain help texts but no menus #}
+      {% endblock %}
+    </div>
 
     <hr>
 
diff --git a/plinth/templates/index.html b/plinth/templates/index.html
index ed9ba691d..f39e724bd 100644
--- a/plinth/templates/index.html
+++ b/plinth/templates/index.html
@@ -38,10 +38,10 @@
               {% endif %}
                     <center>
                       <span class="{{ shortcut.icon }} glyphicon"
-                          style="font-size: 450%"></span>
-                          <br>
-                    {{ shortcut.label }}
-                  </center>
+                            style="font-size: 300%"></span>
+                      <br>
+                      {{ shortcut.label }}
+                    </center>
                   </a>
                 </li>
             </ul>
@@ -77,9 +77,10 @@
       <br>
 
       {% if user.is_authenticated and configure_url %}
-        <a class="btn btn-primary btn-sm" style="margin-left : 10px; margin-bottom : 5px"
+        <a class="btn btn-primary btn-sm"
+           style="margin-left : 10px; margin-bottom : 5px"
            href="{{ configure_url }}">
-            {% trans "Configure &raquo;" %}</a>
+          {% trans "Configure &raquo;" %}</a>
       {% endif %}
 
     </div>
@@ -88,7 +89,7 @@
 {% endblock %}
 
 
-{% block center-header %}
+{% block center-info %}
 
   <h4>
     {% blocktrans trimmed %}