diff --git a/static/css/broadcast.css b/static/css/broadcast.css
index d3a39bf35..982d2e47c 100644
--- a/static/css/broadcast.css
+++ b/static/css/broadcast.css
@@ -4,6 +4,7 @@
 
 #padcontent {
   padding: 10px;
+  font-size: 12px;
 }
 
 #timeslider-wrapper {
@@ -15,7 +16,7 @@
 
 #timeslider-left {
   position: absolute;
-  left:-2px;
+  left:0px;
   background-image: url(/static/img/timeslider_left.png);
   width: 134px;
   height: 63px;
@@ -24,7 +25,7 @@
 #timeslider-right {
   position: absolute;
   top:0px;
-  right:0px;
+  right:-2px;
   background-image: url(/static/img/timeslider_right.png);
   width: 155px;
   height: 63px;
@@ -266,9 +267,10 @@ top:30px;
 float:right;
 }
 
-#returnbutton{
-  width:100px;
-  height:28px;
-  margin-right:4px;
-  background:url("/static/img/timeslider_right.png"); /* im so lazy */
+#returnbutton
+{ 
+  font-size: 16px;
+  line-height: 29px;
+  margin-top: 0;
+  padding-right: 6pt;
 }
diff --git a/static/pad.html b/static/pad.html
index 5c73f97ad..6da27fae8 100644
--- a/static/pad.html
+++ b/static/pad.html
@@ -100,9 +100,9 @@ var clientVars = {};  // ]]>
 </li>
 
 <li>
-        <a href="javascript:void (window.pad&&pad.editbarClick('timeslider'));" title="Show the history of this pad">
-          <img src="/static/img/editbar_timeslider.gif" />
-        </a>
+  <a href="javascript:document.location = document.location+ '/timeslider'" title="Show the history of this pad">
+    <img src="/static/img/editbar_timeslider.gif" />
+  </a>
 </li>
 
 
diff --git a/static/timeslider.html b/static/timeslider.html
index aa9a19eec..a051530ae 100644
--- a/static/timeslider.html
+++ b/static/timeslider.html
@@ -8,9 +8,8 @@
   <meta name="ROBOTS" content="NOINDEX, NOFOLLOW" />
 
   <title>Etherpad Lite Timeslider</title>
-  <link href="/static/css/broadcast.css" rel="stylesheet" type="text/css" />
-<!-- javascript -->
   <link href="/static/css/pad_lite.css" rel="stylesheet" type="text/css" />
+  <link href="/static/css/broadcast.css" rel="stylesheet" type="text/css" />
   <style type="text/css" title="dynamicsyntax"></style>
   <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
   <script type="text/javascript">
@@ -182,7 +181,6 @@
           <!-- -->
         </div>
       </div>
-
       <div id="alertbar">
         <div id="servermsg">
           <h3>Server Notice<span id="servermsgdate"><!-- --></span>:</h3><a id=
@@ -194,7 +192,7 @@
       </div>
 
       <div id="navigation"></div>
-
+      
       <div id="docbar" class="menu docbar">
         <table border="0" cellpadding="0" cellspacing="0" width="100%" id="docbartable"
         class="docbartable">
@@ -277,7 +275,7 @@
 
             <div id="editbarright" class="editbarright">
               <!-- termporary place holder--> 
-              <button id="returnbutton">Return to pad</button>
+              <a id = "returnbutton" href="javascript:document.location=document.location.href.substring(0,document.location.href.lastIndexOf('/timeslider'))">Return to pad</a>
             </div>
 
             <div id="editbarinner" class="editbarinner">
@@ -285,7 +283,7 @@
               "editbartable">
                 <tr>
                   <td>
-                    <h1>Public Pad <span id="revision_label">Latest text of pad
+                    <h1><span id="revision_label">Latest text of pad
                     test</span> <span id="revision_date">Saved June 14, 2011</span></h1>
                   </td>