Update according to mperham's feedback

web/assets/javascripts/application.js

@@ -26,10 +26,11 @@ $(function() {
   $('a[name=poll]').data('polling', false);
 
   pollStatus = $('.poll-status')
+
   pollStatusText = pollStatus.find('.text')
   pollStatusBadge = pollStatus.find('.badge')
-
   pollStatusBadge.hide();
+  pollStatusMarkup = pollStatus.html();
 
   $('a[name=poll]').on('click', function(e) {
     e.preventDefault();
@@ -41,7 +42,7 @@ $(function() {
       clearInterval(pollLink.data('interval'));
       pollLink.text(pollLink.data('text'));
 
-      pollStatus.hide('');
+      pollStatus.html(pollStatusMarkup);
       pollStatusBadge.hide();
 
     } else {
@@ -62,7 +63,6 @@ $(function() {
   });
 
   livePoll = function livePoll(href){
-    console.log('href',href)
     $.get(href, function(data) {
       var responseHtml = $(data);
       $('.summary').replaceWith(responseHtml.find('.summary'));

web/assets/stylesheets/partials/_layout.scss

@@ -102,8 +102,6 @@ header.row{
     }
     li{
       padding:8px 0 5px 0;
-      border-bottom:1px solid #DDD;
-      @include box-shadow(0 1px 0 white);
     }
     .desc{
       font-size:0.8em;
@@ -113,6 +111,7 @@ header.row{
       color: $highlight_color;
       font-size: 1.5em;
       font-weight:bold;
+      float:right;
     }
   }
   .poll-status{
@@ -133,10 +132,7 @@ form{
     margin-right:5px;
   }
 }
-<<<<<<< HEAD
-=======
 
->>>>>>> Layout fixes
 @media (max-width: 979px){
   .navbar-fixed-top, .navbar-fixed-bottom{
     margin: 0 -20px;

web/views/index.slim

@@ -1,8 +1,9 @@
 .row.header
   .span7
     h3 Workers
-  .span2.actions
-    form action="#{root_path}reset" method="post"
-      button.btn.btn.btn-primary.btn-block type="submit" title="If you kill -9 Sidekiq, this table can fill up with old data." Clear worker list
 
 == slim :_workers
+.row
+  .span2
+    form action="#{root_path}reset" method="post"
+      button.btn.btn-primary.btn-block type="submit" title="If you kill -9 Sidekiq, this table can fill up with old data." Clear worker list

web/views/layout.slim

@@ -11,15 +11,15 @@ html
     #page
       .container
         .row
-          .span3.summary_bar
+          .span2.summary_bar
             h3
               span.title Status
               == slim :_status
             == slim :_summary
             .row
-              .span3
+              .span2
                 a.btn.btn-block name='poll' href='#{{root_path}}poll' Live Poll
-              .span3.poll-status
+              .span2.poll-status
                 p
                   span.text
                   span.badge
@@ -32,7 +32,7 @@ html
                 span.desc Time
                 div.data #{Time.now.utc.strftime('%H:%M:%S UTC')}
 
-          .span9
+          .span10
             == yield
 
     script type="text/javascript" src="#{{root_path}}assets/application.js"