diff --git a/styles/templates/default/group.tpl b/styles/templates/default/group.tpl
index d75b78acc..6b4f6622f 100644
--- a/styles/templates/default/group.tpl
+++ b/styles/templates/default/group.tpl
@@ -217,6 +217,7 @@
         <!-- END switch_mod_option -->
     </table>
 
+    <!-- IF PAGINATION and PAGE_NUMBER -->
     <div class="bottom_info">
         <div class="nav">
             <p style="float: left">{PAGE_NUMBER}</p>
@@ -224,6 +225,7 @@
             <div class="clear"></div>
         </div>
     </div><!--/bottom_info-->
+    <!-- ENDIF -->
 
     <!-- IF PENDING_USERS -->
     <table class="forumline">
@@ -304,6 +306,7 @@
     </tfoot>
 </table>
 
+<!-- IF PAGINATION and PAGE_NUMBER -->
 <div class="bottom_info">
     <div class="nav">
         <p style="float: left">{PAGE_NUMBER}</p>
@@ -311,6 +314,7 @@
         <div class="clear"></div>
     </div>
 </div>
+<!-- ENDIF -->
 <!-- ENDIF / RELEASES -->
 
 <!--========================================================================-->
diff --git a/styles/templates/default/memberlist.tpl b/styles/templates/default/memberlist.tpl
index 0d3efef3c..8477efa8f 100644
--- a/styles/templates/default/memberlist.tpl
+++ b/styles/templates/default/memberlist.tpl
@@ -60,11 +60,13 @@
 
 <div class="bottom_info">
 
+    <!-- IF PAGINATION and PAGE_NUMBER -->
 	<div class="nav">
 		<p style="float: left">{PAGE_NUMBER}</p>
 		<p style="float: right">{PAGINATION}</p>
 		<div class="clear"></div>
 	</div>
+    <!-- ENDIF -->
 
 	<div class="spacer_4"></div>
 
diff --git a/styles/templates/default/privmsgs.tpl b/styles/templates/default/privmsgs.tpl
index be85f06db..d8a855c46 100644
--- a/styles/templates/default/privmsgs.tpl
+++ b/styles/templates/default/privmsgs.tpl
@@ -106,11 +106,13 @@
 
 	<div class="spacer_6"></div>
 
+    <!-- IF PAGINATION and PAGE_NUMBER -->
 	<div class="nav">
 		<p style="float: left">{PAGE_NUMBER}</p>
 		<p style="float: right">{PAGINATION}</p>
 		<div class="clear"></div>
 	</div>
+    <!-- ENDIF -->
 
 	<div class="spacer_4"></div>
 
diff --git a/styles/templates/default/search_results.tpl b/styles/templates/default/search_results.tpl
index 5f09466f4..88d87ca7d 100644
--- a/styles/templates/default/search_results.tpl
+++ b/styles/templates/default/search_results.tpl
@@ -218,11 +218,13 @@ function show_edit_options ()
 
 <div class="bottom_info">
 
+    <!-- IF PAGINATION and PAGE_NUMBER -->
 	<div class="nav">
 		<p style="float: left">{PAGE_NUMBER}</p>
 		<p style="float: right">{PAGINATION}</p>
 		<div class="clear"></div>
 	</div>
+    <!-- ENDIF -->
 
 	<div class="spacer_4"></div>
 
diff --git a/styles/templates/default/tracker.tpl b/styles/templates/default/tracker.tpl
index 3f0aa3feb..7fe578bb6 100644
--- a/styles/templates/default/tracker.tpl
+++ b/styles/templates/default/tracker.tpl
@@ -447,11 +447,13 @@ $(function(){
 
 <div class="bottom_info">
 
+    <!-- IF PAGINATION and PAGE_NUMBER -->
 	<div class="nav">
 		<p style="float: left">{PAGE_NUMBER}</p>
 		<p style="float: right">{PAGINATION}</p>
 		<div class="clear"></div>
 	</div>
+    <!-- ENDIF -->
 
 	<div class="spacer_4"></div>
 
diff --git a/styles/templates/default/viewforum.tpl b/styles/templates/default/viewforum.tpl
index 3c5083bd8..30fa1aaf5 100644
--- a/styles/templates/default/viewforum.tpl
+++ b/styles/templates/default/viewforum.tpl
@@ -615,7 +615,7 @@ td.topic_id { cursor: pointer; }
 <!--bottom_info-->
 <div class="bottom_info">
 
-<!-- IF PAGINATION -->
+<!-- IF PAGINATION and PAGE_NUMBER -->
 <div class="nav">
 	<p style="float: left">{PAGE_NUMBER}</p>
 	<p style="float: right">{PAGINATION}</p>
diff --git a/styles/templates/default/viewtopic.tpl b/styles/templates/default/viewtopic.tpl
index bd2229b0b..64255254c 100644
--- a/styles/templates/default/viewtopic.tpl
+++ b/styles/templates/default/viewtopic.tpl
@@ -535,16 +535,31 @@ function build_poll_add_form (src_el)
 <!-- IF HIDE_POST_IMG --><script type="text/javascript">$('img.postImg').remove();</script><!-- ENDIF -->
 <!-- IF HIDE_SMILE --><script type="text/javascript">$('img.smile').remove();</script><!-- ENDIF -->
 
+<!-- IF PAGINATION and PAGE_NUMBER -->
 <table id="pagination" class="topic" cellpadding="0" cellspacing="0">
-<tr>
-	<td class="nav pad_6 {PG_ROW_CLASS}">
-		<p style="float: left">{PAGE_NUMBER}</p>
-		<p style="float: right">{PAGINATION}</p>
-	</td>
-</tr>
+    <tr>
+        <td class="nav pad_6 {PG_ROW_CLASS}">
+            <p style="float: left">{PAGE_NUMBER}</p>
+            <p style="float: right">{PAGINATION}</p>
+        </td>
+    </tr>
 </table><!--/pagination-->
+<!-- ENDIF -->
+
+<table class="topic" cellpadding="0" cellspacing="0">
+    <tr>
+        <td class="catBottom med">
+            <form method="post" action="{S_POST_DAYS_ACTION}">
+                {L_DISPLAY_POSTS}: {S_SELECT_POST_DAYS}&nbsp;
+                {S_SELECT_POST_ORDER}&nbsp;
+                <input type="submit" value="{L_GO}" class="lite" name="submit" />
+            </form>
+        </td>
+    </tr>
+</table>
 
 <!-- IF QUICK_REPLY -->
+<br>
 <form action="{QR_POST_ACTION}" method="post" name="post" onsubmit="if(checkForm(this)){ dis_submit_btn(); }else{ return false; }">
 <input type="hidden" name="mode" value="reply" />
 <input type="hidden" name="t" value="{QR_TOPIC_ID}" />
@@ -580,18 +595,6 @@ function build_poll_add_form (src_el)
 </form>
 <!-- ENDIF / QUICK_REPLY -->
 
-<table class="topic" cellpadding="0" cellspacing="0">
-<tr>
-	<td class="catBottom med">
-	<form method="post" action="{S_POST_DAYS_ACTION}">
-		{L_DISPLAY_POSTS}: {S_SELECT_POST_DAYS}&nbsp;
-		{S_SELECT_POST_ORDER}&nbsp;
-		<input type="submit" value="{L_GO}" class="lite" name="submit" />
-	</form>
-	</td>
-</tr>
-</table>
-
 <table cellpadding="0" class="w100" style="padding-top: 2px;">
 <tr>
 	<td valign="top">