diff --git a/plinth/modules/apps/templates/apps.html b/plinth/modules/apps/templates/apps.html
index a7f56629f..0c875df54 100644
--- a/plinth/modules/apps/templates/apps.html
+++ b/plinth/modules/apps/templates/apps.html
@@ -21,6 +21,7 @@
 {% block content %}
 
 <h2>Apps</h2>
+
 <p>User Applications are web apps hosted on your
 {{ cfg.product_name }}.</p>
 
diff --git a/plinth/modules/diagnostics/templates/diagnostics.html b/plinth/modules/diagnostics/templates/diagnostics.html
index fd91b7fa3..9a2fbbd17 100644
--- a/plinth/modules/diagnostics/templates/diagnostics.html
+++ b/plinth/modules/diagnostics/templates/diagnostics.html
@@ -19,6 +19,7 @@
 {% endcomment %}
 
 {% block content %}
+
 <h2>{{ title }}</h2>
 
 <p>The system diagnostic test will run a number of checks on your
diff --git a/plinth/modules/firewall/templates/firewall.html b/plinth/modules/firewall/templates/firewall.html
index 4e960f835..aa4ea3eb6 100644
--- a/plinth/modules/firewall/templates/firewall.html
+++ b/plinth/modules/firewall/templates/firewall.html
@@ -19,6 +19,7 @@
 {% endcomment %}
 
 {% block content %}
+
 <h2>{{ title }}</h2>
 
 <p>Firewall is a network security system that controls the incoming
diff --git a/plinth/modules/help/templates/help_index.html b/plinth/modules/help/templates/help_index.html
index d65a14f55..21b62a734 100644
--- a/plinth/modules/help/templates/help_index.html
+++ b/plinth/modules/help/templates/help_index.html
@@ -21,6 +21,7 @@
 {% block content %}
 
 <h2>Help</h2>
+
 <p>There are a variety of places to go for help with
 {{ cfg.product_name }} and the box it runs on.</p>
 
diff --git a/plinth/modules/packages/templates/packages.html b/plinth/modules/packages/templates/packages.html
index b642a9b40..172fbac5a 100644
--- a/plinth/modules/packages/templates/packages.html
+++ b/plinth/modules/packages/templates/packages.html
@@ -21,6 +21,7 @@
 {% load bootstrap %}
 
 {% block content %}
+
   <h2>{{ title }}</h2>
 
   <p><code>aptitude purge modules</code></p>
diff --git a/plinth/modules/tor/templates/tor.html b/plinth/modules/tor/templates/tor.html
index d3988b9c6..5b87ef421 100644
--- a/plinth/modules/tor/templates/tor.html
+++ b/plinth/modules/tor/templates/tor.html
@@ -35,9 +35,11 @@
 </p>
 
 <h3>Hidden Service</h3>
+
 <p>A hidden service will allow your {{ cfg.box_name }} to provide selected
 services (such as OwnCloud or Chat) without revealing its location.
 Here is the current configuration:</p>
+
 <ul>
   <li>Hostname: {{ tor_hs_hostname }}</li>
   <li>Ports: {{ tor_hs_ports }}</li>
@@ -52,6 +54,7 @@ Here is the current configuration:</p>
 </form>
 
 <h3>Bridge</h3>
+
 <p>Your {{ cfg.box_name }} is configured as a Tor bridge with obfsproxy, so it
 can help circumvent censorship. If your {{ cfg.box_name }} is behind a router
 or firewall, you should make sure the following ports are open, and
@@ -71,6 +74,7 @@ port-forwarded, if necessary:</p>
 </div>
 
 <h3>SOCKS</h3>
+
 <p>A Tor SOCKS port is available on your {{ cfg.box_name }} on TCP port
 9050.</p>
 
diff --git a/plinth/modules/xmpp/templates/xmpp.html b/plinth/modules/xmpp/templates/xmpp.html
index 97af8aeba..d8ff3db98 100644
--- a/plinth/modules/xmpp/templates/xmpp.html
+++ b/plinth/modules/xmpp/templates/xmpp.html
@@ -24,19 +24,18 @@
 
 {% if is_installed %}
 
-<p>XMPP is an open and standardized communication protocol.
-Here you can run and configure your XMPP server, called ejabberd.
-To actually communicate you can use the
-<a href='/jwchat'>web client</a>
-or any other
-<a href='http://xmpp.org/xmpp-software/clients/' target='_blank'>
-XMPP client
-</a>.</p>
 <a href='/jwchat' target='_blank'class='btn btn-primary'>
   Launch web client
 </a>
+<p>XMPP is an open and standardized communication protocol.  Here you
+  can run and configure your XMPP server, called ejabberd.  To actually
+  communicate, you can use the <a href='/jwchat'>web client</a> or any
+  other <a href='http://xmpp.org/xmpp-software/clients/'
+  target='_blank'> XMPP client </a>.</p>
+
 
 {% else %}
+
 <h2>XMPP Server</h2>
 
 <p>The XMPP server <i>ejabberd</i> is not installed.</p>
diff --git a/plinth/templates/404.html b/plinth/templates/404.html
index 6682de38c..0e6a37131 100644
--- a/plinth/templates/404.html
+++ b/plinth/templates/404.html
@@ -19,6 +19,7 @@
 {% endcomment %}
 
 {% block content %}
+
 <h2>404</h2>
 
 <p>Requested page {{ request_path }} was not found.</p>
diff --git a/plinth/templates/500.html b/plinth/templates/500.html
index 358cdf7d3..a9d3c3b51 100644
--- a/plinth/templates/500.html
+++ b/plinth/templates/500.html
@@ -19,6 +19,7 @@
 {% endcomment %}
 
 {% block content %}
+
 <h2>500</h2>
 
 <p>This is an internal error and not something you caused or can fix.  Please
diff --git a/static/themes/default/css/plinth.css b/static/themes/default/css/plinth.css
index d82538656..7f15c1a17 100644
--- a/static/themes/default/css/plinth.css
+++ b/static/themes/default/css/plinth.css
@@ -1,16 +1,17 @@
 body {
-  padding-top: 70px;
+    padding-top: 70px;
 }
 
 .nav .glyphicon,
 .sidebar .glyphicon {
-  margin-right: 4px;
+    margin-right: 4px;
 }
 
 .navbar-brand img {
-  float: left;
-  margin-top: -14px;
-  padding: 8px;
+    float: left;
+    margin-top: -14px;
+    padding: 8px;
+}
 
 .nav-tabs {
     margin-bottom: 20px;