diff --git a/themes/docs/css/DocumentationViewer.css b/themes/docs/css/DocumentationViewer.css
index c7438a5..0a6a8a1 100644
--- a/themes/docs/css/DocumentationViewer.css
+++ b/themes/docs/css/DocumentationViewer.css
@@ -90,6 +90,7 @@ p { font-size: 12px; line-height: 18px; margin-bottom: 18px; }
 /* Comments */
 #comments {
 	clear: both;
+	padding-top: 20px;
 }
 
 	#comments .notice {
diff --git a/themes/docs/templates/DocumentationViewer.ss b/themes/docs/templates/DocumentationViewer.ss
index c1ce244..f2fd78b 100644
--- a/themes/docs/templates/DocumentationViewer.ss
+++ b/themes/docs/templates/DocumentationViewer.ss
@@ -46,7 +46,7 @@
 						$DocumentationSearchForm
 					</div>
 					
-					<!-- <% if Versions %>
+					<% if Versions %>
 					<div id="versions-nav">
 						<h2>Versions:</h2>
 							<ul>
@@ -59,23 +59,16 @@
 							<% end_control %>
 						</ul>
 					</div>
-					<% end_if %>-->
-					
+					<% end_if %>
 				</div>
 				
 				<div id="content" class="typography">
 					$Layout
 				</div>
 				
-				<div id="comments">
-					<p class="notice">
-						<strong>Comment policy:</strong> Please use comments for <strong>tips and corrections</strong> about the described 
-				functionality. <br />
-				Comments are moderated, we reserve the right to remove comments that are inappropriate or are no longer relevant. Use the <strong><a href="http://silverstripe.com/silverstripe-forum">Silverstripe Forum</a></strong> to ask questions.
-					</p>
-
-					<div id="disqus_thread"></div><script type="text/javascript" src="http://disqus.com/forums/silverstripe-doc/embed.js"></script><noscript><a href="http://silverstripe-doc.disqus.com/?url=ref">View the forum thread.</a></noscript><a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span></a>
-				</div>
+				<% if Content %>
+					<% include Comments %>
+				<% end_if %>
 			</div>
 		</div>
 		
diff --git a/themes/docs/templates/Includes/Comments.ss b/themes/docs/templates/Includes/Comments.ss
new file mode 100644
index 0000000..434765f
--- /dev/null
+++ b/themes/docs/templates/Includes/Comments.ss
@@ -0,0 +1,11 @@
+<div id="comments">
+	<h2>Comments</h2>
+	
+	<p class="notice">
+			<strong>Comment policy:</strong> Please use comments for <strong>tips and corrections</strong> about the described 
+	functionality. <br />
+	Comments are moderated, we reserve the right to remove comments that are inappropriate or are no longer relevant. Use the <strong><a href="http://silverstripe.com/silverstripe-forum">Silverstripe Forum</a></strong> to ask questions.
+	</p>
+
+	<div id="disqus_thread"></div><script type="text/javascript" src="http://disqus.com/forums/silverstripe-doc/embed.js"></script><noscript><a href="http://silverstripe-doc.disqus.com/?url=ref">View the forum thread.</a></noscript><a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span></a>
+</div>
\ No newline at end of file