diff --git a/templates/Layout/Blog.ss b/templates/Layout/Blog.ss
index f804805..95d8934 100644
--- a/templates/Layout/Blog.ss
+++ b/templates/Layout/Blog.ss
@@ -2,41 +2,41 @@
 
 <div class="blog-entry content-container <% if $SideBarView %>unit size3of4<% end_if %>">
 
-    <article>
-        <h1>
-            <% if $ArchiveYear %>
-                <%t Blog.Archive "Archive" %>:
-                <% if $ArchiveDay %>
-                    $ArchiveDate.Nice
-                <% else_if $ArchiveMonth %>
-                    $ArchiveDate.format("F, Y")
-                <% else %>
-                    $ArchiveDate.format("Y")
-                <% end_if %>
-            <% else_if $CurrentTag %>
-                <%t Blog.Tag "Tag" %>: $CurrentTag.Title
-            <% else_if $CurrentCategory %>
-                <%t Blog.Category "Category" %>: $CurrentCategory.Title
-            <% else %>
-                $Title
-            <% end_if %>
-        </h1>
-        
-        <div class="content">$Content</div>
-        
-        <% if $PaginatedList.Exists %>
-            <% loop $PaginatedList %>
-                <% include PostSummary %>
-            <% end_loop %>
-        <% else %>
-            <p><%t Blog.NoPosts "There are no posts" %></p>
-        <% end_if %>
-    </article>
-    
-    $Form
-    $PageComments
-        
-    <% with $PaginatedList %>
+	<article>
+		<h1>
+			<% if $ArchiveYear %>
+				<%t Blog.Archive "Archive" %>:
+				<% if $ArchiveDay %>
+					$ArchiveDate.Nice
+				<% else_if $ArchiveMonth %>
+					$ArchiveDate.format("F, Y")
+				<% else %>
+					$ArchiveDate.format("Y")
+				<% end_if %>
+			<% else_if $CurrentTag %>
+				<%t Blog.Tag "Tag" %>: $CurrentTag.Title
+			<% else_if $CurrentCategory %>
+				<%t Blog.Category "Category" %>: $CurrentCategory.Title
+			<% else %>
+				$Title
+			<% end_if %>
+		</h1>
+
+		<div class="content">$Content</div>
+
+		<% if $PaginatedList.Exists %>
+			<% loop $PaginatedList %>
+				<% include PostSummary %>
+			<% end_loop %>
+		<% else %>
+			<p><%t Blog.NoPosts "There are no posts" %></p>
+		<% end_if %>
+	</article>
+
+	$Form
+	$CommentsForm
+
+	<% with $PaginatedList %>
 		<% include Pagination %>
 	<% end_with %>
 </div>
diff --git a/templates/Layout/BlogPost.ss b/templates/Layout/BlogPost.ss
index 3a34c6e..f3839dc 100644
--- a/templates/Layout/BlogPost.ss
+++ b/templates/Layout/BlogPost.ss
@@ -3,18 +3,18 @@
 <div class="blog-entry content-container <% if $SideBarView %>unit size3of4<% end_if %>">
 	<article>
 		<h1>$Title</h1>
-        
-        <% if $FeaturedImage %>
+
+		<% if $FeaturedImage %>
 			<p class="post-image">$FeaturedImage.setWidth(795)</p>
 		<% end_if %>
-        
+
 		<div class="content">$Content</div>
 
 		<% include EntryMeta %>
 	</article>
-    
-    $Form
-	$PageComments
+
+	$Form
+	$CommentsForm
 </div>
 
 <% include BlogSideBar %>
diff --git a/templates/Layout/Blog_profile.ss b/templates/Layout/Blog_profile.ss
index 69aaff6..a5e94c4 100644
--- a/templates/Layout/Blog_profile.ss
+++ b/templates/Layout/Blog_profile.ss
@@ -2,21 +2,21 @@
 
 <div class="blog-entry content-container <% if $SideBarView %>unit size3of4<% end_if %>">
 
-    <% include MemberDetails %>
+	<% include MemberDetails %>
 
-    <% if $PaginatedList.Exists %>
-        <h2>Posts by $CurrentProfile.FirstName $CurrentProfile.Surname for $Title:</h2>
-        <% loop $PaginatedList %>
-            <% include PostSummary %>
-        <% end_loop %>
-    <% end_if %>
-    
-    $Form
-    $PageComments
+	<% if $PaginatedList.Exists %>
+		<h2>Posts by $CurrentProfile.FirstName $CurrentProfile.Surname for $Title:</h2>
+		<% loop $PaginatedList %>
+			<% include PostSummary %>
+		<% end_loop %>
+	<% end_if %>
 
-    <% with $PaginatedList %>
-        <% include Pagination %>
-    <% end_with %>
+	$Form
+	$CommentsForm
+
+	<% with $PaginatedList %>
+		<% include Pagination %>
+	<% end_with %>
 
 </div>