diff --git a/plinth/modules/tor/templates/tor.html b/plinth/modules/tor/templates/tor.html
index ca32f8176..e73f32ffa 100644
--- a/plinth/modules/tor/templates/tor.html
+++ b/plinth/modules/tor/templates/tor.html
@@ -25,13 +25,14 @@
 {% if is_installed %}
 
 <h3>Status</h3>
-<br style='clear:both'>
+
+<p>
 {% if is_running %}
   <div class='running-status active'></div> Tor is running
 {% else %}
   <div class='running-status inactive'></div> Tor is not running
 {% endif %}
-<br style='clear:both'>
+</p>
 
 <h3>Hidden Service</h3>
 <p>A hidden service will allow your {{ cfg.box_name }} to provide selected
@@ -69,8 +70,6 @@ port-forwarded, if necessary:</p>
   </div>
 </div>
 
-<br style='clear:both'>
-
 <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 43928d469..97af8aeba 100644
--- a/plinth/modules/xmpp/templates/xmpp.html
+++ b/plinth/modules/xmpp/templates/xmpp.html
@@ -38,9 +38,11 @@ XMPP client
 
 {% else %}
 <h2>XMPP Server</h2>
-<p>The XMPP server <i>ejabberd</i> is not installed.<br />ejabberd comes
-  pre-installed with {{ cfg.box_name }}. On any Debian-based system (such as
-  {{ cfg.box_name }}) you may install it using the command
+
+<p>The XMPP server <i>ejabberd</i> is not installed.</p>
+
+<p>ejabberd comes pre-installed with {{ cfg.box_name }}. On any Debian-based
+  system (such as {{ cfg.box_name }}) you may install it using the command
   <code>aptitude install ejabberd</code>.</p>
 
 {% endif %}
diff --git a/plinth/templates/base.html b/plinth/templates/base.html
index 563b62649..851f8d3ed 100644
--- a/plinth/templates/base.html
+++ b/plinth/templates/base.html
@@ -153,7 +153,6 @@
                   </li>
                 {% endfor %}
               </ul>
-              <br />
             {% endif %}
           {% endblock %}
 
diff --git a/static/themes/default/css/plinth.css b/static/themes/default/css/plinth.css
index b323ea4c3..d82538656 100644
--- a/static/themes/default/css/plinth.css
+++ b/static/themes/default/css/plinth.css
@@ -11,6 +11,9 @@ body {
   float: left;
   margin-top: -14px;
   padding: 8px;
+
+.nav-tabs {
+    margin-bottom: 20px;
 }
 
 .running-status {