diff --git a/docs/layouts/_default/single.html b/docs/layouts/_default/single.html
index 29679d5af..e81ddda00 100644
--- a/docs/layouts/_default/single.html
+++ b/docs/layouts/_default/single.html
@@ -3,7 +3,7 @@
 {{ template "chrome/navbar.html" . }}
 <div class="container">
     <div class="row">
-        <div class="col-md-9">
+        <div class="col-md-10">
             <div class="well well-sm">
                     <h3>{{ .Title }}<br> <small>{{ .Description }}</small></h3>
                     <hr>
@@ -12,10 +12,10 @@
         </div>
 
         <!-- Sidebar -->
-        <div class="col-md-3">
+        <div class="col-md-2">
             {{ template "chrome/menu.html" . }}
         </div>
     </div>
 {{ template "chrome/footer.copyright.html" . }}
 </div>
-{{ template "chrome/footer.html" . }}
\ No newline at end of file
+{{ template "chrome/footer.html" . }}
diff --git a/docs/layouts/chrome/menu.html b/docs/layouts/chrome/menu.html
index 2b281ddb6..f16e452f2 100644
--- a/docs/layouts/chrome/menu.html
+++ b/docs/layouts/chrome/menu.html
@@ -1,5 +1,5 @@
     <div class="panel panel-default">
-        <div class="panel-heading" style="padding: 2px 15px;">
+        <div class="panel-heading" style="padding: 2px 10px;">
             <h4>Share and Enjoy.</h4>
         </div>
         <div class="panel-body">
diff --git a/docs/layouts/chrome/navbar.html b/docs/layouts/chrome/navbar.html
index 25bda4745..f78377654 100644
--- a/docs/layouts/chrome/navbar.html
+++ b/docs/layouts/chrome/navbar.html
@@ -14,7 +14,7 @@
                 <li><a href="/downloads/"><i class="fa fa-cloud-download"></i> Downloads</a></li>
                 <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown"><b class="caret"></b> Docs</a>
-                  <ul class="dropdown-menu">
+                  <ul class="dropdown-menu pre-scrollable">
                     <li><a href="/install/"><i class="fa fa-book"></i> Installation</a></li>
                     <li><a href="/docs/"><i class="fa fa-book"></i> Usage</a></li>
                     <li><a href="/filtering/"><i class="fa fa-book"></i> Filtering</a></li>
@@ -30,7 +30,7 @@
                 </li>
                 <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown"><b class="caret"></b> Commands</a>
-                  <ul class="dropdown-menu">
+                  <ul class="dropdown-menu pre-scrollable">
                     <li><a href="/commands/rclone_config/"><i class="fa fa-book"></i> rclone config</a></li>
                     <li><a href="/commands/rclone_copy/"><i class="fa fa-book"></i> rclone copy</a></li>
                     <li><a href="/commands/rclone_sync/"><i class="fa fa-book"></i> rclone sync</a></li>
@@ -52,7 +52,7 @@
                 </li>
                 <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown"><b class="caret"></b> Storage Systems</a>
-                  <ul class="dropdown-menu">
+                  <ul class="dropdown-menu pre-scrollable">
                     <li><a href="/overview/"><i class="fa fa-archive"></i> Overview</a></li>
                     <li><a href="/amazonclouddrive/"><i class="fa fa-amazon"></i> Amazon Drive</a></li>
                     <li><a href="/s3/"><i class="fa fa-amazon"></i> Amazon S3</a></li>
diff --git a/docs/layouts/index.html b/docs/layouts/index.html
index 4f9a47126..264e1de47 100644
--- a/docs/layouts/index.html
+++ b/docs/layouts/index.html
@@ -3,14 +3,14 @@
 {{ template "chrome/navbar.html" . }}
 <div class="container">
     <div class="row">
-        <div class="col-md-9">
+        <div class="col-md-10">
           {{ range $key, $value := .Site.Taxonomies.groups.about.Pages }}
           {{ $value.Content }}
           {{ end }}
         </div>
 
         <!-- Sidebar -->
-        <div class="col-md-3">
+        <div class="col-md-2">
         {{ template "chrome/menu.html" . }}
         </div>
     </div>
diff --git a/docs/layouts/indexes/category.html b/docs/layouts/indexes/category.html
index 2551b79b8..0655674e4 100644
--- a/docs/layouts/indexes/category.html
+++ b/docs/layouts/indexes/category.html
@@ -3,7 +3,7 @@
 {{ template "chrome/navbar.html" . }}
 <div class="container">
     <div class="row">
-        <div class="col-md-9">
+        <div class="col-md-10">
             <div class="well well-sm">
                 <strong>Items in category <code>{{ .Title | lower }}</code></strong>
                 <ul class="list-unstyled">
@@ -15,10 +15,10 @@
         </div>
 
         <!-- Sidebar -->
-        <div class="col-md-3">
+        <div class="col-md-2">
         {{ template "chrome/menu.html" . }}
         </div>
     </div>
 {{ template "chrome/footer.copyright.html" . }}
 </div>
-{{ template "chrome/footer.html" . }}
\ No newline at end of file
+{{ template "chrome/footer.html" . }}
diff --git a/docs/layouts/indexes/post.html b/docs/layouts/indexes/post.html
index bd8d90d66..85ee16cf4 100644
--- a/docs/layouts/indexes/post.html
+++ b/docs/layouts/indexes/post.html
@@ -3,7 +3,7 @@
 {{ template "chrome/navbar.html" . }}
 <div class="container">
     <div class="row">
-        <div class="col-md-9">
+        <div class="col-md-10">
             <div class="well well-sm">
                 <strong>Blog Post Archive</strong>
                 <ul class="list-unstyled">
@@ -15,10 +15,10 @@
         </div>
 
         <!-- Sidebar -->
-        <div class="col-md-3">
+        <div class="col-md-2">
         {{ template "chrome/menu.html" . }}
         </div>
     </div>
 {{ template "chrome/footer.copyright.html" . }}
 </div>
-{{ template "chrome/footer.html" . }}
\ No newline at end of file
+{{ template "chrome/footer.html" . }}
diff --git a/docs/layouts/indexes/tag.html b/docs/layouts/indexes/tag.html
index 16f626dc2..e862f260e 100644
--- a/docs/layouts/indexes/tag.html
+++ b/docs/layouts/indexes/tag.html
@@ -3,7 +3,7 @@
 {{ template "chrome/navbar.html" . }}
 <div class="container">
     <div class="row">
-        <div class="col-md-9">
+        <div class="col-md-10">
             <div class="well well-sm">
                 <strong>Items with tag <code>{{ .Title | lower }}</code></strong>
                 <ul class="list-unstyled">
@@ -15,10 +15,10 @@
         </div>
 
         <!-- Sidebar -->
-        <div class="col-md-3">
+        <div class="col-md-2">
         {{ template "chrome/menu.html" . }}
         </div>
     </div>
 {{ template "chrome/footer.copyright.html" . }}
 </div>
-{{ template "chrome/footer.html" . }}
\ No newline at end of file
+{{ template "chrome/footer.html" . }}
diff --git a/docs/layouts/page/single.html b/docs/layouts/page/single.html
index e9ad0fe9f..589fa8d84 100644
--- a/docs/layouts/page/single.html
+++ b/docs/layouts/page/single.html
@@ -3,12 +3,12 @@
 {{ template "chrome/navbar.html" . }}
 <div class="container">
   <div class="row">
-    <div class="col-md-9">
+    <div class="col-md-10">
       {{ .Content }}
     </div>
-    
+
     <!-- Sidebar -->
-    <div class="col-md-3">
+    <div class="col-md-2">
       {{ template "chrome/menu.html" . }}
     </div>
   </div>
diff --git a/docs/layouts/post/single.html b/docs/layouts/post/single.html
index 05ecc53c7..f32cac983 100644
--- a/docs/layouts/post/single.html
+++ b/docs/layouts/post/single.html
@@ -3,7 +3,7 @@
 {{ template "chrome/navbar.html" . }}
 <div class="container">
     <div class="row">
-        <div class="col-md-9">
+        <div class="col-md-10">
             <div class="well well-sm">
                     <h3>{{ .Title }}<br> <small>{{ .Description }}</small></h3>
                     <hr>
@@ -12,7 +12,7 @@
         </div>
 
         <!-- Sidebar -->
-        <div class="col-md-3">
+        <div class="col-md-2">
             <div class="well well-sm"> <!-- Post-specific stats -->
                 <h4>{{ .Date.Format "January 2, 2006" }}<br>
                 <small>{{ .WordCount }} words</small></h4>
@@ -32,4 +32,4 @@
     </div>
 {{ template "chrome/footer.copyright.html" . }}
 </div>
-{{ template "chrome/footer.html" . }}
\ No newline at end of file
+{{ template "chrome/footer.html" . }}
diff --git a/docs/layouts/section/commands.html b/docs/layouts/section/commands.html
index 96ae72f2c..ad6f9e396 100644
--- a/docs/layouts/section/commands.html
+++ b/docs/layouts/section/commands.html
@@ -3,7 +3,7 @@
 {{ template "chrome/navbar.html" . }}
 <div class="container">
     <div class="row">
-        <div class="col-md-9">
+        <div class="col-md-10">
             <div class="well well-sm">
                     <h3>{{ .Title }}<br> <small>{{ .Description }}</small></h3>
                     <hr>
@@ -24,7 +24,7 @@
         </div>
 
         <!-- Sidebar -->
-        <div class="col-md-3">
+        <div class="col-md-2">
             {{ template "chrome/menu.html" . }}
         </div>
     </div>
diff --git a/docs/static/css/custom.css b/docs/static/css/custom.css
index db7d88b51..ec96edd38 100644
--- a/docs/static/css/custom.css
+++ b/docs/static/css/custom.css
@@ -25,6 +25,12 @@ tbody tr:nth-child(odd) {
    background-color:#d0d0ff
 }
 
+pre code {
+  /* Preserve whitespace. Wrap text only at line breaks. */
+  /* Avoids auto-wrapping the code lines. */
+  white-space: pre
+}
+
 /* Hover over links on headers */
 .header-link {
   position: absolute;