diff --git a/web/skins/classic/css/base/views/report_event_audit.css b/web/skins/classic/css/base/views/report_event_audit.css
index c0f1e799d..cf1b0de3e 100644
--- a/web/skins/classic/css/base/views/report_event_audit.css
+++ b/web/skins/classic/css/base/views/report_event_audit.css
@@ -10,3 +10,8 @@
 .colZeroSize {
   text-align: left;
 }
+
+#results {
+  height: 100%;
+  overflow-y: auto;
+}
diff --git a/web/skins/classic/css/base/views/snapshot.css b/web/skins/classic/css/base/views/snapshot.css
index b54036859..ef9b95c06 100644
--- a/web/skins/classic/css/base/views/snapshot.css
+++ b/web/skins/classic/css/base/views/snapshot.css
@@ -1,5 +1,4 @@
 #content {
-    margin: 0 15px;
 }
 
 .Name {
@@ -15,3 +14,8 @@
 .Description textarea {
   width: 100%;
 }
+
+#video {
+  overflow-y: auto;
+  height: 100%;
+}
diff --git a/web/skins/classic/views/report_event_audit.php b/web/skins/classic/views/report_event_audit.php
index e67f48443..66ff13cef 100644
--- a/web/skins/classic/views/report_event_audit.php
+++ b/web/skins/classic/views/report_event_audit.php
@@ -24,8 +24,6 @@ include('_monitor_filters.php');
 $filterbar = ob_get_contents();
 ob_end_clean();
 
-noCacheHeaders();
-xhtmlHeaders( __FILE__, translate('Console'));
 
 if ( isset($_REQUEST['minTime']) ) {
   $minTime = validHtmlStr($_REQUEST['minTime']);
@@ -105,20 +103,25 @@ while ( $event = $result->fetch(PDO::FETCH_ASSOC) ) {
   $EventsByMonitor[$event['MonitorId']]['Events'][] = $Event;
 } # end foreach event
 
+noCacheHeaders();
+xhtmlHeaders( __FILE__, translate('Report Event Audit'));
+getBodyTopHTML();
+echo $navbar;
 ?>
-<body>
-  <?php echo $navbar ?>
-  <form name="monitorForm" method="post" action="?view=<?php echo $view ?>">
-    <div class="filterBar">
-      <?php echo $filterbar ?>
-      <div id="DateTimeDiv">
-        <label><?php echo translate('Event Start Time') ?></label>
-        <input type="text" name="minTime" id="minTime" value="<?php echo preg_replace('/T/', ' ', $minTime) ?>"/> <?php echo translate('to') ?> 
-        <input type="text" name="maxTime" id="maxTime" value="<?php echo preg_replace('/T/', ' ', $maxTime) ?>"/>
-      </div>
-    </div><!--FilterBar-->
+<div id="page">
+  <div id="content">
+    <form name="monitorForm" method="post" action="?view=<?php echo $view ?>">
+      <div class="filterBar">
+        <?php echo $filterbar ?>
+        <div id="DateTimeDiv">
+          <label><?php echo translate('Event Start Time') ?></label>
+          <input type="text" name="minTime" id="minTime" value="<?php echo preg_replace('/T/', ' ', $minTime) ?>"/> <?php echo translate('to') ?> 
+          <input type="text" name="maxTime" id="maxTime" value="<?php echo preg_replace('/T/', ' ', $maxTime) ?>"/>
+        </div>
+      </div><!--FilterBar-->
+    </form>
 
-    <div class="container-fluid">
+    <div class="container-fluid" id="results">
       <table class="table table-striped table-hover table-condensed" id="consoleTable">
         <thead class="thead-highlight">
           <tr>
@@ -205,5 +208,6 @@ for ( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
         </tbody>
       </table>
     </div>
-  </form>
+</div>
+</div>
 <?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/snapshot.php b/web/skins/classic/views/snapshot.php
index ff36689d9..3330dca56 100644
--- a/web/skins/classic/views/snapshot.php
+++ b/web/skins/classic/views/snapshot.php
@@ -38,10 +38,11 @@ if ( $user['MonitorIds'] ) {
   $monitor_ids = explode(',', $user['MonitorIds']);
 }
 xhtmlHeaders(__FILE__, translate('Snapshot').' '.$snapshot->Id());
+getBodyTopHTML();
+echo getNavBarHTML();
 ?>
-<body>
   <div id="page">
-    <?php echo getNavBarHTML() ?>
+    <div id="content">
 <?php 
 if ( !$snapshot->Id() ) {
   echo '<div class="error">Snapshot was not found.</div>';
@@ -66,7 +67,7 @@ if ( !$snapshot->Id() ) {
       
       <h2><?php echo translate('Snapshot').' '.$snapshot->Id() ?></h2>
     </div>
-    <div class="d-flex flex-row justify-content-between py-1">
+    <div class="d-flex flex-row justify-content-between py-1" id="snapshot">
       <!--
       <div class="form-group"><label><?php echo translate('Created By') ?></label>
       -->
@@ -81,9 +82,10 @@ if ( !$snapshot->Id() ) {
         <textarea name="snapshot[Description]"><?php echo validHtmlStr($snapshot->Description()); ?></textarea>
       </div>
     </div>
+  </form>
 <?php if ( $snapshot->Id() ) { ?>
 <!-- BEGIN VIDEO CONTENT ROW -->
-    <div id="content" class="justify-content-center">
+    <div id="video" class="row justify-content-center">
 <?php
     $events = $snapshot->Events();
     $width = 100 / ( count($events) < 2 ? 1 : ( ( count($events) < 4 ) ? count($events) : 4 ) )-1;
@@ -94,7 +96,6 @@ if ( !$snapshot->Id() ) {
 ?>
     </div><!--content-->
 <?php } // end if snapshot->Id() ?>
-  </form>
   <h2 id="downloadProgress" class="<?php
             if ( isset($_REQUEST['generated']) ) {
               if ( $_REQUEST['generated'] )
@@ -116,5 +117,6 @@ if ( !$snapshot->Id() ) {
     ?></span>
     <span id="downloadProgressTicker"></span>
   </h2>
+  </div>
 </div><!--page-->
 <?php xhtmlFooter() ?>
