diff --git a/htdocs/lib/Layout.php b/htdocs/lib/Layout.php
index 38a3ba8..703debb 100644
--- a/htdocs/lib/Layout.php
+++ b/htdocs/lib/Layout.php
@@ -153,14 +153,14 @@ class Layout
 	//]]>
 	</script>
 
-    <div style="padding-top:20px;">
-      <div style="display: inline-block;">
-	<a href="<?php echo URL_ROOT ?>"><img src="images/singularity_icon.png" width="150px" height="150px"/></a>
+    <div style="padding-top:10px;">
+      <div style="display: inline-block;  margin-right: 30px;">
+	    <a href="<?php echo URL_ROOT ?>"><img src="images/singularity_icon.png" width="100px" height="100px"/></a>
       </div>
-      <div style="display: inline-block;color: #eee; padding: 55px 0 0 30px; vertical-align: top;">
-	<a href="<?php echo URL_ROOT ?>" style="font-size: 4em; font-weight: bold;">Singularity Viewer</a>
-	<br/>
-	<span style="font-size: 1.6em;">Automated Crash Report Processing</span>
+      <div style="display: inline-block;color: #eee; padding-bottom: 10px; vertical-align: bottom;">
+	    <a href="<?php echo URL_ROOT ?>" style="font-size: 3em; font-weight: bold;">Singularity Viewer</a>
+	    <br/>
+	    <span style="font-size: 1.6em;">Automated Crash Report Processing</span>
       </div>
     </div>
 	
diff --git a/htdocs/lib/SearchFilter.php b/htdocs/lib/SearchFilter.php
index 5e8f050..669b5f5 100644
--- a/htdocs/lib/SearchFilter.php
+++ b/htdocs/lib/SearchFilter.php
@@ -236,6 +236,8 @@ for($i = 0; $i < count($grids); $i++)
     
     function renderPaginator($total)
     {
+        $l = $_SERVER["PHP_SELF"];
+        
         ob_start();
 ?>
 <script>
@@ -296,15 +298,15 @@ for($i = 0; $i < count($grids); $i++)
 </script>
 
 <!--div id="paginator" class="ui-widget-header ui-corner-all" style="display: inline-block; padding: 4px"-->
-    <button id="first">First</button>
-    <button id="previous">Previous</button>
+    <a id="first">First</a>
+    <a id="previous">Previous</a>
     <div style="display: inline-block; text-align: center; width: 175px;">
         <?php echo $this->offset + 1 ?> - 
         <?php echo $this->offset + $this->limit > $total ? $total : $this->offset + $this->limit  ?> out of
         <?php echo $total ?>
     </div>
-    <button id="next">Next</button>
-    <button id="last">Last</button>
+    <a id="next">Next</a>
+    <a id="last">Last</a>
 <!--/div-->
 
 <?php