diff --git a/themes/demo/pages/ajax.htm b/themes/demo/pages/ajax.htm
index 620af4daf..55ef65201 100644
--- a/themes/demo/pages/ajax.htm
+++ b/themes/demo/pages/ajax.htm
@@ -65,3 +65,9 @@ function onTest()
 
 <!-- Page Explanation -->
 <div class="container">{% partial "explain/ajax.htm" %}</div>
+
+<br />
+
+<div class="text-center">
+    <p><a href="{{ 'plugins'|page }}" class="btn btn-lg btn-default">Continue to Plugin components</a></p>
+</div>
diff --git a/themes/demo/pages/home.htm b/themes/demo/pages/home.htm
index 130389095..73aa1919e 100644
--- a/themes/demo/pages/home.htm
+++ b/themes/demo/pages/home.htm
@@ -22,8 +22,7 @@ layout = "default"
     <!-- Layouts -->
     <h3>Layouts</h3>
     <p class="lead">
-        <i class="icon-th-large"></i>
-        Layouts define the page scaffold.
+        <i class="icon-th-large"></i> &nbsp; Layouts define the page scaffold.
     </p>
     <p>
         The layout file <code>layouts/default.htm</code> defines the page scaffold &mdash;
@@ -38,8 +37,7 @@ layout = "default"
     <!-- Pages -->
     <h3>Pages</h3>
     <p class="lead">
-        <i class="icon-copy"></i>
-        Pages hold the content for each URL.
+        <i class="icon-copy"></i> &nbsp; Pages hold the content for each URL.
     </p>
     <p>
         The page file <code>pages/home.htm</code> defines the page URL (<code>/</code> for this page) and the page content.
@@ -53,8 +51,7 @@ layout = "default"
     <!-- Partials -->
     <h3>Partials</h3>
     <p class="lead">
-        <i class="icon-tags"></i>
-        Partials contain reusable chunks of HTML markup.
+        <i class="icon-tags"></i> &nbsp; Partials contain reusable chunks of HTML markup.
     </p>
     <p>
         Partials are chunks of HTML defined in separate files which can be included anywhere.
@@ -69,8 +66,7 @@ layout = "default"
     <!-- Content blocks -->
     <h3>Content blocks</h3>
     <p class="lead">
-        <i class="icon-font"></i>
-        Content blocks are text or HTML blocks that can be edited separately from the page or layout.
+        <i class="icon-font"></i> &nbsp; Content blocks are text or HTML blocks that can be edited separately from the page or layout.
     </p>
     <p>
         The introductory text used on this page is defined in the <code>content/welcome.htm</code> file.
@@ -83,8 +79,7 @@ layout = "default"
     <!-- Placeholders -->
     <h3>Placeholders</h3>
     <p class="lead">
-        <i class="icon-bookmark"></i>
-        Placeholders allow pages to inject content to a layout.
+        <i class="icon-bookmark"></i> &nbsp; Placeholders allow pages to inject content to a layout.
     </p>
     <p>
         The common use is injecting page-specific links to StyleSheet or JavaScript files to the HEAD tag defined in the layout.
@@ -107,8 +102,7 @@ layout = "default"
     <!-- Assets -->
     <h3>Assets</h3>
     <p class="lead">
-        <i class="icon-picture"></i>
-        Assets are resource files like images and stylesheets.
+        <i class="icon-picture"></i> &nbsp; Assets are resource files like images and stylesheets.
     </p>
     <p>This theme stores its asset files (JavaScript, StyleSheet, images, fonts, etc) in the <code>themes/demo/assets</code> directory. This theme is also packaged with these useful 3rd party tools:</p>
     <ul class="list-inline">
@@ -118,7 +112,7 @@ layout = "default"
     </ul>
     <p>You might prefer to remove them for your website implementation.</p>
 
-    <hr />
+    <br />
 
     <div class="text-center">
         <p><a href="{{ 'ajax'|page }}" class="btn btn-lg btn-default">Continue to AJAX framework</a></p>
diff --git a/themes/demo/pages/plugins.htm b/themes/demo/pages/plugins.htm
index ac6b8465b..118aafdab 100644
--- a/themes/demo/pages/plugins.htm
+++ b/themes/demo/pages/plugins.htm
@@ -22,3 +22,9 @@ max = 3
 
 <!-- Page Explanation -->
 <div class="container">{% partial "explain/plugins.htm" %}</div>
+
+<br />
+
+<div class="text-center">
+    <p><a target="_blank" href="http://octobercms.com/docs" class="btn btn-lg btn-default">Learn more at October's Documentation</a></p>
+</div>
diff --git a/themes/demo/partials/explain/ajax.htm b/themes/demo/partials/explain/ajax.htm
index 38ce28f6d..c5950078c 100644
--- a/themes/demo/partials/explain/ajax.htm
+++ b/themes/demo/partials/explain/ajax.htm
@@ -3,10 +3,10 @@
 <!-- This file is an explanation of the AJAX page -->
 
 <p class="lead">
-    <i class="icon-copy"></i>
-        The HTML markup for this example:
-    </p>
-    <pre>{% filter escape %}<!-- The form -->
+    <i class="icon-copy"></i> &nbsp; The HTML markup for this example:
+</p>
+
+<pre>{% filter escape %}<!-- The form -->
 <form data-request="onTest" data-request-update="calcresult: '#result'">
     <input type="text" value="15" name="value1">
     <select name="operation">
@@ -26,8 +26,7 @@
 <hr />
 
 <p class="lead">
-    <i class="icon-tags"></i>
-    The <code>calcresult</code> partial:
+    <i class="icon-tags"></i> &nbsp; The <code>calcresult</code> partial:
 </p>
 
 <pre>{% filter escape %}
@@ -40,8 +39,7 @@
 <hr />
 
 <p class="lead">
-    <i class="icon-code"></i>
-    The <code>onTest</code> PHP code:
+    <i class="icon-code"></i> &nbsp; The <code>onTest</code> PHP code:
 </p>
 
 <pre>function onTest()
@@ -65,10 +63,3 @@
             break;
     }
 }</pre>
-
-
-<hr />
-
-<div class="text-center">
-    <p><a href="{{ 'plugins'|page }}" class="btn btn-lg btn-default">Continue to Plugin components</a></p>
-</div>
diff --git a/themes/demo/partials/explain/plugins.htm b/themes/demo/partials/explain/plugins.htm
index 452c3efc0..8637e0e8d 100644
--- a/themes/demo/partials/explain/plugins.htm
+++ b/themes/demo/partials/explain/plugins.htm
@@ -1,8 +1,7 @@
 <hr />
 
 <p class="lead">
-    <i class="icon-copy"></i>
-    The HTML markup for this example:
+    <i class="icon-copy"></i> &nbsp; The HTML markup for this example:
 </p>
 <pre>
 {% filter escape %}
@@ -12,14 +11,7 @@
 <hr />
 
 <p class="lead">
-    <i class="icon-question"></i> 
-    Wait, only one line is needed?
+    <i class="icon-question"></i> &nbsp; Wait, only one line is needed?
 </p>
 <p><em>Yes!</em> unlike the <a href="{{ 'ajax'|page }}">AJAX example</a>, components are simple building blocks that can be used with a small amount of code.</p>
 <p>The <code>demoTodo</code> component used here is provided by the plugin called <strong>October\Demo</strong>, you can find it in the <code>plugins/october/demo</code> folder.</p>
-
-<hr />
-
-<div class="text-center">
-    <p><a target="_blank" href="http://octobercms.com/docs" class="btn btn-lg btn-default">Learn more at October's Documentation</a></p>
-</div>
diff --git a/themes/demo/partials/footer.htm b/themes/demo/partials/footer.htm
index b58bfed31..47cdff23a 100644
--- a/themes/demo/partials/footer.htm
+++ b/themes/demo/partials/footer.htm
@@ -1,5 +1,6 @@
 <div id="footer">
     <div class="container">
+        <hr />
         <p class="muted credit">&copy; 2013 - {{ "now"|date("Y") }} Alexey Bobkov &amp; Samuel Georges.</p>
     </div>
 </div>