diff --git a/html/pages/bill.inc.php b/html/pages/bill.inc.php
index 1a5475b41..ce123f5d5 100644
--- a/html/pages/bill.inc.php
+++ b/html/pages/bill.inc.php
@@ -102,11 +102,6 @@ if (bill_permitted($bill_id))
 
   if ($_SESSION['userlevel'] == "10")
   {
-#    echo(" | ");
-#    if ($_GET['optb'] == "admin_history") { echo("<span class='pagemenu-selected'>"); }
-#    echo("<a href='bills/history/'>Previous Billing Period</a>");
-#    if ($_GET['optb'] == "admin_history") { echo("</span>"); }
-
     echo(" | ");
     if ($_GET['optb'] == "edit") { echo("<span class='pagemenu-selected'>"); }
     echo("<a href='bill/".$bill_id."/edit/'>Edit</a>");
@@ -118,7 +113,7 @@ if (bill_permitted($bill_id))
     if ($_GET['optb'] == "delete") { echo("</span>"); }
   }
 
-  echo("<div style='font-weight: bold; float: right;'><a href='bills/'>Back to Bills</a></div>");
+  echo('<div style="font-weight: bold; float: right;"><a href="bills/"><img align=absmiddle src="/images/16/arrow_left.png"> Back to Bills</a></div>');
 
 
   print_optionbar_end();
@@ -354,7 +349,7 @@ if (bill_permitted($bill_id))
      else
      {
        echo("<h3>Billing View</h3>$bi");
-       echo("<h3>Previous Bill View</h3>$li");
+#       echo("<h3>Previous Bill View</h3>$li");
        echo("<h3>24 Hour View</h3>$di");
        echo("<h3>Monthly View</h3>$mi");
 #       echo("<br /><a href=\"rate.php?" . $_SERVER['QUERY_STRING'] . "&amp;all=yes\">Graph All Data (SLOW)</a>");
diff --git a/html/pages/bills.inc.php b/html/pages/bills.inc.php
index c94e00617..c2af10a4a 100644
--- a/html/pages/bills.inc.php
+++ b/html/pages/bills.inc.php
@@ -76,54 +76,7 @@ elseif ($_GET['opta'] == "add")
 
 } else {
 
-  include("pages/bill/search.inc.php");
-  print_optionbar_start('40');
-
-?>
-
-        <table cellpadding=7 cellspacing=0 class=devicetable width=100%>
-<form method='post' action=''>
-<tr>
-             <td width='40' align=center valign=middle><div style='font-weight: bold; font-size: 16px;'>Bills</div></td>
-             <td width='240'><span style='font-weight: bold; font-size: 14px;'></span>
-             <input type="text" name="hostname" id="hostname" size=40 value="<?php echo($_POST['hostname']); ?>" />
-             </td>
-             <td width='100'>
-      <select name='os' id='os'>
-      <option value=''>All Types</option>
-      <option value=''>CDR</option>
-      <option value=''>95th</option>
-      <option value=''>Quota</option>
-       </select>
-             </td>
-             <td width='100'>
-      <select name='hardware' id='hardware'>
-      <option value=''>All States</option>
-      <option value=''>Under Quota</option>
-      <option value=''>Over Quota</option>
-       </select>
-             </td>
-             <td width='100'>
-      <select name='location' id='location'>
-      <option value=''>All Customers</option>
-       </select>
-     </td>
-                 <td>
-         <input type=submit class=submit value=Search>
-             </td>
-             <td width='170' style='font-weight:bold; font-size: 12px;'>
-                     <a href='bills/history/'><img src="images/16/information.png" align=absmiddle alt="Previous Billing Period"> Previous Billing Period</a>
-             </td>
-             <td width='80' style='font-weight:bold; font-size: 12px;'>
-                                                   <a href='bills/add/'><img src="images/16/add.png" align=absmiddle alt="Add"> Add Bill</a>
-             </td>
-           </tr>
-  </form>
-</table>
-
-<?php
-
-  print_optionbar_end();
+  include("pages/bills/search.inc.php");
 
   $i=0;
   echo("<table border=0 cellspacing=0 cellpadding=5 class=devicetable width=100%>
diff --git a/html/pages/bills/search.inc.php b/html/pages/bills/search.inc.php
new file mode 100644
index 000000000..67432a5dd
--- /dev/null
+++ b/html/pages/bills/search.inc.php
@@ -0,0 +1,61 @@
+<?php
+
+  print_optionbar_start('40');
+
+?>
+
+        <table cellpadding=7 cellspacing=0 class=devicetable width=100%>
+<form method='post' action=''>
+<tr>
+             <td width='40' align=center valign=middle><div style='font-weight: bold; font-size: 16px;'>Bills</div></td>
+             <td width='240'><span style='font-weight: bold; font-size: 14px;'></span>
+             <input type="text" name="hostname" id="hostname" size=40 value="<?php echo($_POST['hostname']); ?>" />
+             </td>
+             <td width='100'>
+      <select name='os' id='os'>
+      <option value=''>All Types</option>
+      <option value=''>CDR</option>
+      <option value=''>95th</option>
+      <option value=''>Quota</option>
+       </select>
+             </td>
+             <td width='100'>
+      <select name='hardware' id='hardware'>
+      <option value=''>All States</option>
+      <option value=''>Under Quota</option>
+      <option value=''>Over Quota</option>
+       </select>
+             </td>
+             <td width='100'>
+      <select name='location' id='location'>
+      <option value=''>All Customers</option>
+       </select>
+     </td>
+                 <td>
+         <input type=submit class=submit value=Search>
+             </td>
+             <td width='170' style='font-weight:bold; font-size: 12px;'>
+<?php
+
+  if ($_GET['opta'] == "history")
+  {
+    echo('<a href="bills/"><img src="images/16/clock.png" align=absmiddle alt="Current Billing Period"> Current Billing Period</a>');
+  } else
+  {
+    echo('<a href="bills/history/"><img src="images/16/clock_red.png" align=absmiddle alt="Previous Billing Period"> Previous Billing Period</a>');
+  }
+
+?>
+             </td>
+             <td width='80' style='font-weight:bold; font-size: 12px;'>
+                                                   <a href='bills/add/'><img src="images/16/add.png" align=absmiddle alt="Add"> Add Bill</a>
+             </td>
+           </tr>
+  </form>
+</table>
+
+<?php
+
+  print_optionbar_end();
+
+?>