diff --git a/templates/base.html b/templates/base.html
index c03db43..2a04a52 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -2,136 +2,160 @@
   Copyright 2014 Team 254. All Rights Reserved.
   Author: pat@patfairbank.com (Patrick Fairbank)
 
-  Base template used by most pages to render the top bar and include common resources.
+  Base template used by most pages to include common resources and optionally render the top bar.
 */}}
 {{define "base"}}
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>{{template "title" .}} - {{.EventSettings.Name}} - Cheesy Arena</title>
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
-    <link rel="shortcut icon" href="/static/img/favicon.ico">
-    <link rel="apple-touch-icon" href="/static/img/apple-icon.png">
-    <link href="/static/css/lib/bootstrap.min.css" rel="stylesheet">
-    <link href="/static/css/lib/bootstrap-colorpicker.min.css" rel="stylesheet">
-    <link href="/static/css/lib/bootstrap-datetimepicker.min.css" rel="stylesheet">
-    <link href="/static/css/cheesy-arena.css" rel="stylesheet">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-  </head>
-  <body>
-    <div class="navbar navbar-default navbar-static-top" role="navigation">
+  <!DOCTYPE html>
+  <html>
+    <head>
+      {{template "head_common" .}}
+    </head>
+    <body>
+      <div class="navbar navbar-default navbar-static-top" role="navigation">
+        <div class="container">
+          <div class="navbar-header">
+            <a class="navbar-brand" href="/">Cheesy Arena</a>
+            <button type="button" class="navbar-toggle" data-toggle="collapse"
+                data-target="#navbar-collapse-menu">
+              <span class="sr-only">Toggle navigation</span>
+              <span class="icon-bar"></span>
+              <span class="icon-bar"></span>
+              <span class="icon-bar"></span>
+            </button>
+          </div>
+          <div class="navbar-collapse collapse" id="navbar-collapse-menu">
+            <ul class="nav navbar-nav">
+              <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown">Setup</a>
+                <ul class="dropdown-menu">
+                  <li><a href="/setup/settings">Settings</a></li>
+                  <li><a href="/setup/teams">Team List</a></li>
+                  <li><a href="/setup/schedule">Match Scheduling</a></li>
+                  <li><a href="/setup/lower_thirds">Lower Thirds</a></li>
+                  <li><a href="/setup/sponsor_slides">Sponsor Slides</a></li>
+                  <li><a href="/setup/displays">Display Configuration</a></li>
+                  <li><a href="/setup/led_plc">LED and PLC Testing</a></li>
+                </ul>
+              </li>
+              <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown">Run</a>
+                <ul class="dropdown-menu">
+                  <li><a href="/match_play">Match Play</a></li>
+                  <li><a href="/match_review">Match Review</a></li>
+                  <li><a href="/static/logs">Match Logs</a></li>
+                  <li><a href="/alliance_selection">Alliance Selection</a></li>
+                </ul>
+              </li>
+              <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown">Panel</a>
+                <ul class="dropdown-menu">
+                  <li><a href="/panels/referee">Referee</a></li>
+                  <li><a href="/panels/scoring/red">Scoring &ndash; Red</a></li>
+                  <li><a href="/panels/scoring/blue">Scoring &ndash; Blue</a></li>
+                </ul>
+              </li>
+              <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown">Report</a>
+                <ul class="dropdown-menu">
+                  <li class="dropdown-header">PDF Reports</li>
+                  <li><a target="_blank" href="/reports/pdf/teams">Team List</a></li>
+                  <li><a target="_blank" href="/reports/pdf/schedule/practice">Practice Schedule</a></li>
+                  <li><a target="_blank" href="/reports/pdf/schedule/qualification">Qualification Schedule</a></li>
+                  <li><a target="_blank" href="/reports/pdf/schedule/elimination">Playoff Schedule</a></li>
+                  <li><a target="_blank" href="/reports/pdf/rankings">Standings</a></li>
+                  <li class="divider"></li>
+                  <li class="dropdown-header">CSV Data Export</li>
+                  <li><a target="_blank" href="/reports/csv/teams">Team List</a></li>
+                  <li><a target="_blank" href="/reports/csv/schedule/practice">Practice Schedule</a></li>
+                  <li><a target="_blank" href="/reports/csv/schedule/qualification">Qualification Schedule</a></li>
+                  <li><a target="_blank" href="/reports/csv/schedule/elimination">Playoff Schedule</a></li>
+                  <li><a target="_blank" href="/reports/csv/rankings">Standings</a></li>
+                  {{if .EventSettings.NetworkSecurityEnabled}}
+                    <li><a target="_blank" href="/reports/csv/wpa_keys">WPA Keys</a></li>
+                  {{end}}
+                </ul>
+              </li>
+              <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown">Display</a>
+                <ul class="dropdown-menu">
+                  <li><a href="/displays/alliance_station">Alliance Station</a></li>
+                  <li><a href="/displays/announcer">Announcer</a></li>
+                  <li><a href="/displays/audience">Audience</a></li>
+                  <li><a href="/displays/fta">Field Monitor</a></li>
+                  <li><a href="/displays/pit">Pit</a></li>
+                </ul>
+              </li>
+            </ul>
+            <ul class="nav navbar-nav navbar-right">
+              <li><a href="#" onclick="$('#aboutPage').modal('show');">About</a></li>
+            </ul>
+          </div>
+        </div>
+      </div>
       <div class="container">
-        <div class="navbar-header">
-          <a class="navbar-brand" href="/">Cheesy Arena</a>
-          <button type="button" class="navbar-toggle" data-toggle="collapse"
-              data-target="#navbar-collapse-menu">
-            <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-        </div>
-        <div class="navbar-collapse collapse" id="navbar-collapse-menu">
-          <ul class="nav navbar-nav">
-            <li class="dropdown">
-              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Setup</a>
-              <ul class="dropdown-menu">
-                <li><a href="/setup/settings">Settings</a></li>
-                <li><a href="/setup/teams">Team List</a></li>
-                <li><a href="/setup/schedule">Match Scheduling</a></li>
-                <li><a href="/setup/lower_thirds">Lower Thirds</a></li>
-                <li><a href="/setup/sponsor_slides">Sponsor Slides</a></li>
-                <li><a href="/setup/displays">Display Configuration</a></li>
-                <li><a href="/setup/led_plc">LED and PLC Testing</a></li>
-              </ul>
-            </li>
-            <li class="dropdown">
-              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Run</a>
-              <ul class="dropdown-menu">
-                <li><a href="/match_play">Match Play</a></li>
-                <li><a href="/match_review">Match Review</a></li>
-                <li><a href="/static/logs">Match Logs</a></li>
-                <li><a href="/alliance_selection">Alliance Selection</a></li>
-              </ul>
-            </li>
-            <li class="dropdown">
-              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Panel</a>
-              <ul class="dropdown-menu">
-                <li><a href="/panels/referee">Referee</a></li>
-                <li><a href="/panels/scoring/red">Scoring &ndash; Red</a></li>
-                <li><a href="/panels/scoring/blue">Scoring &ndash; Blue</a></li>
-              </ul>
-            </li>
-            <li class="dropdown">
-              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Report</a>
-              <ul class="dropdown-menu">
-                <li class="dropdown-header">PDF Reports</li>
-                <li><a target="_blank" href="/reports/pdf/teams">Team List</a></li>
-                <li><a target="_blank" href="/reports/pdf/schedule/practice">Practice Schedule</a></li>
-                <li><a target="_blank" href="/reports/pdf/schedule/qualification">Qualification Schedule</a></li>
-                <li><a target="_blank" href="/reports/pdf/schedule/elimination">Playoff Schedule</a></li>
-                <li><a target="_blank" href="/reports/pdf/rankings">Standings</a></li>
-                <li class="divider"></li>
-                <li class="dropdown-header">CSV Data Export</li>
-                <li><a target="_blank" href="/reports/csv/teams">Team List</a></li>
-                <li><a target="_blank" href="/reports/csv/schedule/practice">Practice Schedule</a></li>
-                <li><a target="_blank" href="/reports/csv/schedule/qualification">Qualification Schedule</a></li>
-                <li><a target="_blank" href="/reports/csv/schedule/elimination">Playoff Schedule</a></li>
-                <li><a target="_blank" href="/reports/csv/rankings">Standings</a></li>
-                {{if .EventSettings.NetworkSecurityEnabled}}
-                  <li><a target="_blank" href="/reports/csv/wpa_keys">WPA Keys</a></li>
-                {{end}}
-              </ul>
-            </li>
-            <li class="dropdown">
-              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Display</a>
-              <ul class="dropdown-menu">
-                <li><a href="/displays/alliance_station">Alliance Station</a></li>
-                <li><a href="/displays/announcer">Announcer</a></li>
-                <li><a href="/displays/audience">Audience</a></li>
-                <li><a href="/displays/fta">Field Monitor</a></li>
-                <li><a href="/displays/pit">Pit</a></li>
-              </ul>
-            </li>
-          </ul>
-          <ul class="nav navbar-nav navbar-right">
-            <li><a href="#" onclick="$('#aboutPage').modal('show');">About</a></li>
-          </ul>
-        </div>
+        {{template "body" .}}
       </div>
-    </div>
-    <div class="container">
-    {{template "body" .}}
-    </div>
-    <div id="aboutPage" class="modal" style="top: 20%;">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-            <h4 class="modal-title">About Cheesy Arena</h4>
-          </div>
-          <div class="modal-body">
-            <p>A field management system that just works.</p>
-            <p>Copyright &copy; 2014-2018 Team 254. All Rights Reserved.</p>
-            <p><a href="https://github.com/Team254/cheesy-arena">https://github.com/Team254/cheesy-arena</a></p>
-          </div>
-          <div class="modal-footer">
-            <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+      <div id="aboutPage" class="modal" style="top: 20%;">
+        <div class="modal-dialog">
+          <div class="modal-content">
+            <div class="modal-header">
+              <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+              <h4 class="modal-title">About Cheesy Arena</h4>
+            </div>
+            <div class="modal-body">
+              <p>A field management system that just works.</p>
+              <p>Copyright &copy; 2014-2018 Team 254. All Rights Reserved.</p>
+              <p><a href="https://github.com/Team254/cheesy-arena">https://github.com/Team254/cheesy-arena</a></p>
+            </div>
+            <div class="modal-footer">
+              <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+            </div>
           </div>
         </div>
       </div>
-    </div>
-    <script src="/static/js/lib/jquery.min.js"></script>
-    <script src="/static/js/lib/jquery.json-2.4.min.js"></script>
-    <script src="/static/js/lib/jquery.websocket-0.0.1.js"></script>
-    <script src="/static/js/lib/bootstrap.min.js"></script>
-    <script src="/static/js/lib/bootstrap-colorpicker.min.js"></script>
-    <script src="/static/js/lib/moment.min.js"></script>
-    <script src="/static/js/lib/bootstrap-datetimepicker.min.js"></script>
-    <script src="/static/js/lib/handlebars-1.3.0.js"></script>
-    <script src="/static/js/cheesy-websocket.js"></script>
-    {{template "script" .}}
-  </body>
-</html>
+      {{template "script_common" .}}
+      {{template "script" .}}
+    </body>
+  </html>
+{{end}}
+
+{{define "base_no_navbar"}}
+  <!DOCTYPE html>
+  <html>
+    <head>
+      {{template "head_common" .}}
+    </head>
+    <body>
+      <div class="container">
+        {{template "body" .}}
+      </div>
+      {{template "script_common" .}}
+      {{template "script" .}}
+    </body>
+  </html>
+{{end}}
+
+{{define "head_common"}}
+  <title>{{template "title" .}} - {{.EventSettings.Name}} - Cheesy Arena</title>
+  <meta name="apple-mobile-web-app-capable" content="yes">
+  <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
+  <link rel="shortcut icon" href="/static/img/favicon.ico">
+  <link rel="apple-touch-icon" href="/static/img/apple-icon.png">
+  <link href="/static/css/lib/bootstrap.min.css" rel="stylesheet">
+  <link href="/static/css/lib/bootstrap-colorpicker.min.css" rel="stylesheet">
+  <link href="/static/css/lib/bootstrap-datetimepicker.min.css" rel="stylesheet">
+  <link href="/static/css/cheesy-arena.css" rel="stylesheet">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+{{end}}
+
+{{define "script_common"}}
+  <script src="/static/js/lib/jquery.min.js"></script>
+  <script src="/static/js/lib/jquery.json-2.4.min.js"></script>
+  <script src="/static/js/lib/jquery.websocket-0.0.1.js"></script>
+  <script src="/static/js/lib/bootstrap.min.js"></script>
+  <script src="/static/js/lib/bootstrap-colorpicker.min.js"></script>
+  <script src="/static/js/lib/moment.min.js"></script>
+  <script src="/static/js/lib/bootstrap-datetimepicker.min.js"></script>
+  <script src="/static/js/lib/handlebars-1.3.0.js"></script>
+  <script src="/static/js/cheesy-websocket.js"></script>
 {{end}}
diff --git a/templates/fta_display.html b/templates/fta_display.html
index b6e78b1..b8990be 100644
--- a/templates/fta_display.html
+++ b/templates/fta_display.html
@@ -6,6 +6,7 @@
 */}}
 {{define "title"}}Field Monitor{{end}}
 {{define "body"}}
+<br />
 <div class="row">
   <div class="col-lg-12">
     <div class="row text-center">
diff --git a/templates/scoring_panel.html b/templates/scoring_panel.html
index 8c36cf4..4c18c9a 100644
--- a/templates/scoring_panel.html
+++ b/templates/scoring_panel.html
@@ -6,6 +6,7 @@
 */}}
 {{define "title"}}Scoring{{end}}
 {{define "body"}}
+<br />
 <div class="row">
   <div class="text-center" id="waitingMessage" style="display: none;">
     <h3>Waiting for the next match...</h3>
diff --git a/web/announcer_display.go b/web/announcer_display.go
index 2ca3174..d4ed032 100644
--- a/web/announcer_display.go
+++ b/web/announcer_display.go
@@ -28,7 +28,7 @@ func (web *Web) announcerDisplayHandler(w http.ResponseWriter, r *http.Request)
 	data := struct {
 		*model.EventSettings
 	}{web.arena.EventSettings}
-	err = template.ExecuteTemplate(w, "base", data)
+	err = template.ExecuteTemplate(w, "base_no_navbar", data)
 	if err != nil {
 		handleWebErr(w, err)
 		return
diff --git a/web/fta_display.go b/web/fta_display.go
index 3226957..b9d52d1 100644
--- a/web/fta_display.go
+++ b/web/fta_display.go
@@ -25,7 +25,7 @@ func (web *Web) ftaDisplayHandler(w http.ResponseWriter, r *http.Request) {
 	data := struct {
 		*model.EventSettings
 	}{web.arena.EventSettings}
-	err = template.ExecuteTemplate(w, "base", data)
+	err = template.ExecuteTemplate(w, "base_no_navbar", data)
 	if err != nil {
 		handleWebErr(w, err)
 		return
diff --git a/web/scoring_panel.go b/web/scoring_panel.go
index 95a52aa..b69c810 100644
--- a/web/scoring_panel.go
+++ b/web/scoring_panel.go
@@ -38,7 +38,7 @@ func (web *Web) scoringPanelHandler(w http.ResponseWriter, r *http.Request) {
 		*model.EventSettings
 		Alliance string
 	}{web.arena.EventSettings, alliance}
-	err = template.ExecuteTemplate(w, "base", data)
+	err = template.ExecuteTemplate(w, "base_no_navbar", data)
 	if err != nil {
 		handleWebErr(w, err)
 		return
