diff --git a/static/css/broadcast.css b/static/css/broadcast.css
index 94962916..d3a39bf3 100644
--- a/static/css/broadcast.css
+++ b/static/css/broadcast.css
@@ -24,7 +24,7 @@
 #timeslider-right {
   position: absolute;
   top:0px;
-  right:-2px;
+  right:0px;
   background-image: url(/static/img/timeslider_right.png);
   width: 155px;
   height: 63px;
@@ -32,7 +32,7 @@
 
 
 #timeslider {
-  margin:7px;
+/*  margin:7px;*/
   margin-bottom: 0px;
   height: 63px;
   margin-left: 9px;
@@ -249,3 +249,26 @@ div #timeslider div#steppers div#rightstep {
   margin-right: 14px;
   border: rgb(149, 149, 149) 1px solid;
 }
+
+.topbarcenter{
+display:none;
+}
+
+#docbar{
+display:none;
+}
+
+#padmain{
+top:30px;
+}
+
+#editbarright{
+float:right;
+}
+
+#returnbutton{
+  width:100px;
+  height:28px;
+  margin-right:4px;
+  background:url("/static/img/timeslider_right.png"); /* im so lazy */
+}
diff --git a/static/css/pad_lite.css b/static/css/pad_lite.css
index c22d7b17..80a9d41e 100644
--- a/static/css/pad_lite.css
+++ b/static/css/pad_lite.css
@@ -320,7 +320,7 @@ a#hidetopmsg { position: absolute; right: 5px; bottom: 5px; }
 #padmain {
   margin-top: 0px;
   position: absolute;
-  top: 0px;
+  top: 63px !important;
   left: 0px;
   right: 0px;
   bottom: 0px;
diff --git a/static/img/editbar_timeslider.gif b/static/img/editbar_timeslider.gif
new file mode 100644
index 00000000..0a24bb32
Binary files /dev/null and b/static/img/editbar_timeslider.gif differ
diff --git a/static/img/timeslider_background.png b/static/img/timeslider_background.png
index faa45c68..851af4e8 100644
Binary files a/static/img/timeslider_background.png and b/static/img/timeslider_background.png differ
diff --git a/static/img/timeslider_left.png b/static/img/timeslider_left.png
index 594d86b7..48a9b0e1 100644
Binary files a/static/img/timeslider_left.png and b/static/img/timeslider_left.png differ
diff --git a/static/img/timeslider_right.png b/static/img/timeslider_right.png
index 3bf10a2e..1a1b2685 100644
Binary files a/static/img/timeslider_right.png and b/static/img/timeslider_right.png differ
diff --git a/static/pad.html b/static/pad.html
index 0a86df5a..5c73f97a 100644
--- a/static/pad.html
+++ b/static/pad.html
@@ -98,6 +98,14 @@ var clientVars = {};  // ]]>
 	  <img src="/static/img/editbar_redo.gif" />
 	</a>
 </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>
+</li>
+
+
 <li>
 	<a href="javascript:void (window.pad&&pad.editbarClick('embed'));" title="Embed this pad">
 	  <img src="/static/img/editbar_embed.gif" />
diff --git a/static/timeslider.html b/static/timeslider.html
index 791bd496..d27a5ef9 100644
--- a/static/timeslider.html
+++ b/static/timeslider.html
@@ -8,8 +8,9 @@
   <meta name="ROBOTS" content="NOINDEX, NOFOLLOW" />
 
   <title>Etherpad Lite Timeslider</title>
-  <link href="/static/css/pad2_ejs.css" rel="stylesheet" type="text/css" />
-  <link href="/static/css/broadcast.css" rel="stylesheet" type="text/css" /><!-- javascript -->
+  <link href="/static/css/broadcast.css" rel="stylesheet" type="text/css" />
+<!-- javascript -->
+  <link href="/static/css/pad_lite.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">
@@ -271,7 +272,8 @@
             </div>
 
             <div id="editbarright" class="editbarright">
-              <!-- -->
+              <!-- termporary place holder--> 
+              <button id="returnbutton">Return to pad</button>
             </div>
 
             <div id="editbarinner" class="editbarinner">