diff --git a/web/assets/stylesheets/application.css b/web/assets/stylesheets/application.css
index 8dc225e6..1f0471f0 100755
--- a/web/assets/stylesheets/application.css
+++ b/web/assets/stylesheets/application.css
@@ -113,10 +113,10 @@ header.row .pagination {
   margin-bottom: 10px;
   border-width: 0px;
 }
-.summary_bar #live-poll {
-  line-height: 28px;
+.nav #live-poll {
+  line-height: 25px;
 }
-.summary_bar #live-poll.active {
+#live-poll.active {
   background-color: #009300;
 }
 .summary_bar ul {
diff --git a/web/views/_nav.erb b/web/views/_nav.erb
index 8df86c66..e209b564 100644
--- a/web/views/_nav.erb
+++ b/web/views/_nav.erb
@@ -21,6 +21,15 @@
           <a href="<%= root_path %><%= url %>"><%= t(title) %></a>
         </li>
       <% end %>
+
+
+
+    </ul>
+
+    <ul class="nav pull-right">
+      <li>
+        <%= erb :_poll %>
+      </li>
     </ul>
   </div>
 </div>
diff --git a/web/views/_poll.erb b/web/views/_poll.erb
new file mode 100644
index 00000000..df78fa54
--- /dev/null
+++ b/web/views/_poll.erb
@@ -0,0 +1,14 @@
+<% if params[:poll] %>
+  <script>
+    setInterval("window.location.reload(true)", 2000);
+  </script>
+<% end %>
+<% unless current_path == '' %>
+  <div class="span2 pull-right actions">
+    <% if params[:poll] %>
+      <a id="live-poll" class="btn btn-block btn-primary active" href="<%= root_path %><%= current_path %>"><%= t('StopPolling') %></a>
+    <% else %>
+      <a id="live-poll" class="btn btn-block btn-primary" href="<%= root_path %><%= current_path %>?poll=true"><%= t('LivePoll') %></a>
+    <% end %>
+  </div>
+<% end %>
diff --git a/web/views/layout.erb b/web/views/layout.erb
index 1f6e97ad..44cdd770 100644
--- a/web/views/layout.erb
+++ b/web/views/layout.erb
@@ -7,11 +7,6 @@
     <link href="<%= root_path %>stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" />
     <script type="text/javascript" src="<%= root_path %>javascripts/application.js"></script>
     <script type="text/javascript" src="<%= root_path %>javascripts/locales/jquery.timeago.<%= locale %>.js"></script>
-    <% if params[:poll] %>
-      <script>
-        setInterval("window.location.reload(true)", 2000);
-      </script>
-    <% end %>
   </head>
   <body class="admin">
     <div class="navbar navbar-fixed-top">
@@ -22,17 +17,6 @@
       <div class="container">
         <div class="row">
           <div class="span12 summary_bar">
-            <div class="row">
-              <% unless current_path == '' %>
-                <div class="span2 pull-right actions">
-                  <% if params[:poll] %>
-                    <a id="live-poll" class="btn btn-block btn-primary active" href="<%= root_path %><%= current_path %>"><%= t('StopPolling') %></a>
-                  <% else %>
-                    <a id="live-poll" class="btn btn-block btn-primary" href="<%= root_path %><%= current_path %>?poll=true"><%= t('LivePoll') %></a>
-                  <% end %>
-                </div>
-              <% end %>
-            </div>
             <%= erb :_summary %>
           </div>
 
