diff --git a/resources/report/report.html b/resources/report/report.html
index 972e34e1..203b7ba5 100644
--- a/resources/report/report.html
+++ b/resources/report/report.html
@@ -54,27 +54,27 @@
     <header>
         <img src="../icon.ico">
         <ol>
-            <li data-action="open-menu" data-target="fileMenu">File
+            <li data-action="view-ui" data-target="fileMenu">File
             <ol id="fileMenu" class="hidden">
-                <li>Redate Plugins
-                <li>Open Debug Log Location
+                <li data-action="redate-plugins">Redate Plugins
+                <li data-action="open-log-location">Open Debug Log Location
             </ol>
-            <li data-action="open-menu" data-target="gameMenu">Game
+            <li data-action="view-ui" data-target="gameMenu">Game
             <ol id="gameMenu" class="hidden">
-                <!-- Generated game <li> elements go here. -->
+                <!-- Generated game <li> elements go here. The action should be 'change-game' and the target the game's folder name, I think. -->
             </ol>
-            <li data-action="open-dialog" data-target="settings">Settings
-            <li data-action="open-menu" data-target="helpMenu">Help
+            <li data-action="view-ui" data-target="settings">Settings
+            <li data-action="view-ui" data-target="helpMenu">Help
             <ol id="helpMenu" class="hidden">
-                <li>Help
-                <li data-action="open-dialog" data-target="about">About
+                <li data-action="open-readme">Help
+                <li data-action="view-ui" data-target="about">About
             </ol>
         </ol>
         <ol>
-            <li>Update Masterlist
-            <li>Sort
-            <li class="hidden">Apply
-            <li class="hidden">Cancel
+            <li data-action="update-masterlist">Update Masterlist
+            <li data-action="sort">Sort
+            <li data-action="apply-sort" class="hidden">Apply
+            <li data-action="cancel-sort" class="hidden">Cancel
         </ol>
     </header>
     <nav>
@@ -85,7 +85,7 @@
             <ol id="pluginsNav">
                 <!-- Generated <li> elements go here, containing # links to each plugin's section in the list. -->
             </ol>
-            <li>Filters
+            <li data-action="view-ui" data-target="filters">Filters
         </ol>
     </nav>
     <div id="main">
diff --git a/resources/report/script.js b/resources/report/script.js
index fe71180d..ae55f6b9 100644
--- a/resources/report/script.js
+++ b/resources/report/script.js
@@ -200,14 +200,7 @@ function setupEventHandlers() {
             i--;
         }
     }
-    document.getElementById('filtersToggle').addEventListener('click', toggleFilters, false);
-    /*Set up handlers for section display.*/
-    elemArr = document.getElementById('nav').querySelectorAll('.button[data-section]');
-    var i = elemArr.length - 1;
-    while (i > -1) {
-        elemArr[i].addEventListener('click', showSection, false);
-        i--;
-    }
+    /*Set up handlers for filters.*/
     document.getElementById('hideVersionNumbers').addEventListener('click', toggleDisplayCSS, false);
     document.getElementById('hideCRCs').addEventListener('click', toggleDisplayCSS, false);
     document.getElementById('hideBashTags').addEventListener('click', toggleDisplayCSS, false);
@@ -355,7 +348,7 @@ for (var i = 0; i < menus.length; ++i) {
     menus[i].addEventListener('click', function(evt) {
         var action = evt.currentTarget.getAttribute('data-action');
         var target = document.getElementById(evt.currentTarget.getAttribute('data-target'));
-        if (action == 'open-menu' || action == 'open-dialog') {
+        if (action == 'view-ui') {
             if (isVisible(target)) {
                 hideElement(target);
                 if (target.getAttribute('data-overlay')) {
diff --git a/resources/report/style.css b/resources/report/style.css
index 07fe75d1..cd5340c1 100644
--- a/resources/report/style.css
+++ b/resources/report/style.css
@@ -25,6 +25,7 @@ body {
     font:10pt/1.5 Helvetica,sans-serif;
     margin:0;
     background:#f8f8f8;
+    height: 100%;
 }
 noscript {
     background:#c00;
@@ -125,6 +126,9 @@ nav ol li {
     position: absolute;
     top: 3em;
     left: 20em;
+    right:0;
+    height: calc(100% - 3em);
+    overflow: auto;
 }
 
 section, #settings, #about, #settings {