diff --git a/trivia/static/script.js b/trivia/static/script.js
index f5d9b04..fed5c87 100644
--- a/trivia/static/script.js
+++ b/trivia/static/script.js
@@ -51,11 +51,8 @@ function ToggleAutorefresh() {
 // Client Initialization
 $().ready(function () {
     // Setup all click functions
-    $(".js-scroll-row-start").on("click", ToggleAutoscroll);
-    $(".js-scroll-row-stop").on("click", ToggleAutoscroll);
-
-    $(".js-refresh-start").on("click", ToggleAutorefresh);
-    $(".js-refresh-stop").on("click", ToggleAutorefresh).addClass("pointer");
+    $(".js-scroll-row").on("click", ToggleAutoscroll);
+    $(".js-refresh").on("click", ToggleAutorefresh);
 
     ToggleAutoscroll()
     ToggleAutorefresh()
diff --git a/trivia/static/style.css b/trivia/static/style.css
index e24cfbd..71dc63a 100644
--- a/trivia/static/style.css
+++ b/trivia/static/style.css
@@ -13,7 +13,7 @@ body { font-family: Calibri, Arial, sans-serif; margin: 0; padding: 0; position:
 tr[data-row-index="0"] td { border-top: 0.25em solid #000; }
 
 .ui-header { background-color: #b51329; border-bottom: 2px solid #27233a; color: #fff; padding: 0.5em 1em; }
-.ui-content { padding: 0.5em 1em; }
+/*.ui-content { padding: 0.5em 1em; }*/
 .ui-footer { }
 
 .center { text-align: center; }
@@ -35,26 +35,4 @@ tr[data-row-index="0"] td { border-top: 0.25em solid #000; }
 .table-striped > tbody > tr:nth-child(odd) { background-color: #f0f0f0; }
 .table-striped > tbody > tr.has-warning:nth-child(odd) { background-color: #faf2cc; border-color: #f8e5be; }
 .table-hover > tbody > tr:hover { background-color: #e0e0e0; } /* hover needs to come after striped so that striped rows have hover */
-.table-hover > tbody > tr.has-warning:hover, .table-hover > tbody > tr.has-warning-hover:hover { background-color: #f8edb5; border-color: #f6e79d; }
-
-.ui-header {
-    background-color: #b51329;
-    border-bottom: 2px solid #27233a;
-    color: #fff;
-    padding: 0.5em 1em;
-}
-
-.controls {
-    float: right;
-    font-size: 80%;
-    padding-top: 0.25em;
-}
-
-.ui-content {
-    padding: 0.5em 1em;
-}
-
-.small-no-wrap {
-    white-space: nowrap;
-    width: 1%;
-}
\ No newline at end of file
+.table-hover > tbody > tr.has-warning:hover, .table-hover > tbody > tr.has-warning-hover:hover { background-color: #f8edb5; border-color: #f6e79d; }
\ No newline at end of file
diff --git a/trivia/templates/index.html b/trivia/templates/index.html
index d18c84c..713aa9e 100644
--- a/trivia/templates/index.html
+++ b/trivia/templates/index.html
@@ -16,14 +16,18 @@
                 EfTA Trivia Night
             </span>
             <span class="controls pointer">
-              <span class="js-scroll-row">Scroll</span>
-              <span class="js-scroll-row-start">Start</span>
-              <span class="js-scroll-row-stop">Stop</span>
+              <span class="js-scroll-row">
+                  Scroll
+                <span class="js-scroll-row-start">Start</span>
+                <span class="js-scroll-row-stop">Stop</span>
+              </span>
               |
-              <span class="js-refresh">Refresh</span>
-              <span class="js-refresh-start">Start</span>
-              <span class="js-refresh-stop">Stop</span>
-              <span class="js-refresh-count"></span>
+              <span class="js-refresh">
+                Refresh
+                <span class="js-refresh-start">Start</span>
+                <span class="js-refresh-stop">Stop</span>
+                <span class="js-refresh-count"></span>
+              </span>
             </span>
         </header>
         <div class="ui-content">