diff --git a/content/common/kwant.css b/content/common/kwant.css
index ad292c9583317dd0948e91ee0f11a47941ae2606..876d40a78fc5a79829aa42f4924b0d958a9b3d7a 100644
--- a/content/common/kwant.css
+++ b/content/common/kwant.css
@@ -1,6 +1,6 @@
 @import url(html4css1.css);
 
-/* keeping a scrollbar always there to make centering work properly */
+/* Keeping a scrollbar always there to make centering work properly. */
 html {
     overflow-y: scroll;
 }
@@ -10,7 +10,14 @@ body {
     max-width: 55em;
     margin: 0 auto;
     font-family: "Bitstream Vera Serif",  Georgia, serif;
+}
+
+div.padding {
+    margin: 1em;
+}
 
+/* Enable hyphenation. */
+body {
     text-align:justify;
     -webkit-hyphens: auto;
     -moz-hyphens: auto;
@@ -18,8 +25,15 @@ body {
     -o-hyphens: auto;
     hyphens: auto;
 }
+tt, pre {
+    -webkit-hyphens: none;
+    -moz-hyphens: none;
+    -ms-hyphens: none;
+    -o-hyphens: none;
+    hyphens: none;
+}
 
-/* link color is an average of the kwant logo */
+/* The link color is the average color of the Kwant logo. */
 a {
     color: #045e94;
     text-decoration: none;
@@ -81,6 +95,10 @@ div.leftside {
     float: left;
 }
 
+div.rightside {
+    float: right;
+}
+
 div.section{
     height: auto;
     overflow: auto;
diff --git a/templates/base.mako b/templates/base.mako
index 78cbb4573f44dfc997bb36e9a1198bfd2e593137..febf8b0231f50e49c1b4d81d265e5fceb099f1a9 100644
--- a/templates/base.mako
+++ b/templates/base.mako
@@ -12,6 +12,7 @@
 </head>
 
 <body>
+<div class="padding">
 <div id="header" class="meta">
   <a href="/"><img alt="kwant_logo.png" src="/common/kwant_logo.png" /></a>
 <h3 class="hidden_structure">Navigation</h3>
@@ -28,6 +29,7 @@
 
 ${next.body()}\
 <%block name="tail"></%block>\
+</div>
 </body>
 
 </html>