diff --git a/templates/partials/thread_tools.tpl b/templates/partials/thread_tools.tpl
index cf25398..4e46ad1 100644
--- a/templates/partials/thread_tools.tpl
+++ b/templates/partials/thread_tools.tpl
@@ -7,66 +7,24 @@
 	</button>
 	<ul class="dropdown-menu dropdown-menu-right">
 		<!-- IF privileges.editable -->
-		<li>
-			<a component="topic/mark-unread-for-all" href="#">
-				<i class="fa fa-fw fa-inbox"></i> [[topic:thread_tools.markAsUnreadForAll]]
-			</a>
-		</li>
-		<li>
-			<a component="topic/pin" href="#" class="<!-- IF pinned -->hidden<!-- ENDIF pinned -->">
-				<i class="fa fa-fw fa-thumb-tack"></i> [[topic:thread_tools.pin]]
-			</a>
-		</li>
-		<li>
-			<a component="topic/unpin" href="#" class="<!-- IF !pinned -->hidden<!-- ENDIF !pinned -->">
-				<i class="fa fa-fw fa-thumb-tack fa-rotate-90"></i> [[topic:thread_tools.unpin]]
-			</a>
-		</li>
-		<li>
-			<a component="topic/lock" href="#" class="<!-- IF locked -->hidden<!-- ENDIF locked -->">
-				<i class="fa fa-fw fa-lock"></i> [[topic:thread_tools.lock]]
-			</a>
-		</li>
-		<li>
-			<a component="topic/unlock" href="#" class="<!-- IF !locked -->hidden<!-- ENDIF !locked -->">
-				<i class="fa fa-fw fa-unlock"></i> [[topic:thread_tools.unlock]]
-			</a>
-		</li>
+		<li><a component="topic/mark-unread-for-all" href="#"><i class="fa fa-fw fa-inbox"></i> [[topic:thread_tools.markAsUnreadForAll]]</a></li>
+		<li><a component="topic/pin" href="#" class="<!-- IF pinned -->hidden<!-- ENDIF pinned -->"><i class="fa fa-fw fa-thumb-tack"></i> [[topic:thread_tools.pin]]</a></li>
+		<li><a component="topic/unpin" href="#" class="<!-- IF !pinned -->hidden<!-- ENDIF !pinned -->"><i class="fa fa-fw fa-thumb-tack fa-rotate-90"></i> [[topic:thread_tools.unpin]]</a></li>
+		<li><a component="topic/lock" href="#" class="<!-- IF locked -->hidden<!-- ENDIF locked -->"><i class="fa fa-fw fa-lock"></i> [[topic:thread_tools.lock]]</a></li>
+		<li><a component="topic/unlock" href="#" class="<!-- IF !locked -->hidden<!-- ENDIF !locked -->"><i class="fa fa-fw fa-unlock"></i> [[topic:thread_tools.unlock]]</a></li>
 		<li class="divider"></li>
-		<li>
-			<a component="topic/move" href="#">
-				<i class="fa fa-fw fa-arrows"></i> [[topic:thread_tools.move]]
-			</a>
-		</li>
-		<li>
-			<a component="topic/fork" href="#">
-				<i class="fa fa-fw fa-code-fork"></i> [[topic:thread_tools.fork]]
-			</a>
-		</li>
+		<li><a component="topic/move" href="#"><i class="fa fa-fw fa-arrows"></i> [[topic:thread_tools.move]]</a></li>
+		<li><a component="topic/fork" href="#"><i class="fa fa-fw fa-code-fork"></i> [[topic:thread_tools.fork]]</a></li>
 		<li class="divider"></li>
 		<!-- ENDIF privileges.editable -->
 
 		<!-- IF privileges.deletable -->
-		<li>
-			<a component="topic/delete" href="#" class="<!-- IF deleted -->hidden<!-- ENDIF deleted -->">
-				<i class="fa fa-fw fa-trash-o"></i> [[topic:thread_tools.delete]]
-			</a>
-		</li>
-		<li>
-			<a component="topic/restore" href="#" class="<!-- IF !deleted -->hidden<!-- ENDIF !deleted -->">
-				<i class="fa fa-fw fa-history"></i> [[topic:thread_tools.restore]]
-			</a>
-		</li>
-		<li>
-			<a component="topic/purge" href="#" class="<!-- IF !deleted -->hidden<!-- ENDIF !deleted -->">
-				<i class="fa fa-fw fa-eraser"></i> [[topic:thread_tools.purge]]
-			</a>
-		</li>
+		<li><a component="topic/delete" href="#" class="<!-- IF deleted -->hidden<!-- ENDIF deleted -->"><i class="fa fa-fw fa-trash-o"></i> [[topic:thread_tools.delete]]</a></li>
+		<li><a component="topic/restore" href="#" class="<!-- IF !deleted -->hidden<!-- ENDIF !deleted -->"><i class="fa fa-fw fa-history"></i> [[topic:thread_tools.restore]]</a></li>
+		<li><a component="topic/purge" href="#" class="<!-- IF !deleted -->hidden<!-- ENDIF !deleted -->"><i class="fa fa-fw fa-eraser"></i> [[topic:thread_tools.purge]]</a></li>
 
 		<!-- BEGIN thread_tools -->
-		<li>
-			<a href="#" class="{thread_tools.class}"><i class="fa fa-fw {thread_tools.icon}"></i> {thread_tools.title}</a>
-		</li>
+		<li><a href="#" class="{thread_tools.class}"><i class="fa fa-fw {thread_tools.icon}"></i> {thread_tools.title}</a></li>
 		<!-- END thread_tools -->
 		<!-- ENDIF privileges.deletable -->
 	</ul>
diff --git a/templates/partials/topic/post-menu.tpl b/templates/partials/topic/post-menu.tpl
index 890623b..b24b3b4 100644
--- a/templates/partials/topic/post-menu.tpl
+++ b/templates/partials/topic/post-menu.tpl
@@ -1,7 +1,6 @@
 <span class="dropdown moderator-tools">
 	<a href="#" data-toggle="dropdown"><i class="fa fa-fw fa-ellipsis-v"></i></a>
 	<ul class="dropdown-menu dropdown-menu-right" role="menu">
-
 		<!-- IF posts.display_moderator_tools -->
 		<li role="presentation" class="dropdown-header">[[topic:tools]]</li>
 		<li role="presentation">
diff --git a/templates/partials/topic/reply-button.tpl b/templates/partials/topic/reply-button.tpl
index c9a70cb..07f5360 100644
--- a/templates/partials/topic/reply-button.tpl
+++ b/templates/partials/topic/reply-button.tpl
@@ -1,9 +1,6 @@
-
-
 <a component="topic/reply" href="#" class="btn btn-primary <!-- IF !privileges.topics:reply -->hidden<!-- ENDIF !privileges.topics:reply -->">[[topic:reply]]</a>
 
 <!-- IF loggedIn -->
-
 <!-- IF !privileges.topics:reply -->
 <!-- IF locked -->
 <a component="topic/reply/locked" class="btn btn-primary" disabled><i class="fa fa-lock"></i> [[topic:locked]]</a>
@@ -19,7 +16,4 @@
 <!-- IF !privileges.topics:reply -->
 <a href="{config.relative_path}/login" class="btn btn-primary">[[topic:guest-login-reply]]</a>
 <!-- ENDIF !privileges.topics:reply -->
-
-<!-- ENDIF loggedIn -->
-
-
+<!-- ENDIF loggedIn -->
\ No newline at end of file