diff --git a/resources/report/bower.json b/resources/report/bower.json
index ebcd74df..9064a697 100644
--- a/resources/report/bower.json
+++ b/resources/report/bower.json
@@ -13,21 +13,25 @@
     "tests"
   ],
   "dependencies": {
-    "polymer": "Polymer/polymer#~0.4.2",
-    "paper-icon-button": "Polymer/paper-icon-button#~0.4.2",
-    "paper-dropdown-menu": "Polymer/paper-dropdown-menu#~0.4.2",
-    "core-toolbar": "Polymer/core-toolbar#~0.4.2",
-    "core-icons": "Polymer/core-icons#~0.4.2",
-    "core-tooltip": "Polymer/core-tooltip#~0.4.2",
-    "core-drawer-panel": "Polymer/core-drawer-panel#~0.4.2",
-    "paper-input": "Polymer/paper-input#~0.4.2",
-    "paper-tabs": "Polymer/paper-tabs#~0.4.2",
-    "core-menu": "Polymer/core-menu#~0.4.2",
-    "paper-checkbox": "Polymer/paper-checkbox#~0.4.2",
-    "paper-dialog": "Polymer/paper-dialog#~0.4.2",
-    "paper-menu-button": "Polymer/paper-menu-button#~0.4.2",
+    "polymer": "Polymer/polymer#~0.5.0",
+    "paper-icon-button": "Polymer/paper-icon-button#~0.5.0",
+    "paper-dropdown-menu": "Polymer/paper-dropdown-menu#~0.5.0",
+    "core-toolbar": "Polymer/core-toolbar#~0.5.0",
+    "core-icons": "Polymer/core-icons#~0.5.0",
+    "core-tooltip": "Polymer/core-tooltip#~0.5.0",
+    "core-drawer-panel": "Polymer/core-drawer-panel#~0.5.0",
+    "paper-input": "Polymer/paper-input#~0.5.0",
+    "paper-tabs": "Polymer/paper-tabs#~0.5.0",
+    "core-menu": "Polymer/core-menu#~0.5.0",
+    "paper-checkbox": "Polymer/paper-checkbox#~0.5.0",
+    "paper-dialog": "Polymer/paper-dialog#~0.5.0",
+    "paper-menu-button": "Polymer/paper-menu-button#~0.5.0",
     "Jed": "SlexAxton/Jed#a9d03e1bbca9211a8b29a93a298a7ee9ddb353f0",
     "marked": "chjj/marked#~0.3.2",
-    "requirejs": "jrburke/requirejs-bower#~2.1.15"
+    "requirejs": "jrburke/requirejs-bower#~2.1.15",
+    "paper-progress": "Polymer/paper-progress#~0.5.0",
+    "core-animated-pages": "Polymer/core-animated-pages#~0.5.1",
+    "paper-toast": "Polymer/paper-toast#~0.5.1",
+    "core-list": "Polymer/core-list#~0.5.1"
   }
 }
diff --git a/resources/report/css/overrides.css b/resources/report/css/overrides.css
index 8bb282f9..93b75ed5 100644
--- a/resources/report/css/overrides.css
+++ b/resources/report/css/overrides.css
@@ -1,22 +1,25 @@
 /* These styles override Polymer's own internal styling for certain elements. */
 
-/* The following 3 rules are for setting the sizes of the drawer and panel. */
-#container::shadow #main {
-    left: 33% !important;
-}
-#container::shadow .narrow-layout #main {
-    left: 0 !important;
-}
-#container::shadow #drawer {
-    width: 33% !important;
+/* The following is for setting the size of the drawer in narrow mode. */
+#container::shadow .narrow-layout #drawer {
+    width: 50% !important;
+    background: #f8f8f8;
 }
 
 /* These overrides change the colour of the game menu's text and underline. */
-#gameMenu::shadow #control {
-    color: white;
+#gameMenu::shadow > paper-dropdown-menu {
     border-bottom-color: #f1f1f1;
 }
-#gameMenu::shadow #menu {
+#gameMenu[disabled]::shadow > paper-dropdown-menu {
+    border-bottom-color: #c9c9c9;
+}
+#gameMenu::shadow > paper-dropdown-menu::shadow #label, #gameMenu::shadow > paper-dropdown-menu::shadow #arrow {
+    color: white;
+}
+#gameMenu[disabled]::shadow > paper-dropdown-menu::shadow #label, #gameMenu[disabled]::shadow > paper-dropdown-menu::shadow #arrow {
+    color: #c9c9c9;
+}
+#gameMenu {
     color: black;
 }
 
@@ -43,16 +46,6 @@ html /deep/ paper-tab::shadow #ink {
     color: #4285f4;
 }
 
-/* This override change the font size of the sidebar items to be the body text size. */
-#cardsNav /deep/ #label {
-    font-size: 10pt;
-}
-
-/* This override change the position of the link in <loot-plugin-item> so that it doesn't cover up tooltips. */
-loot-plugin-item::shadow ::content > a {
-    left: 112px;
-}
-
 /* This override change the positioning of the progress dialog to adapt to content changes. */
 #progressDialog {
     position: inherit !important;
@@ -61,4 +54,46 @@ loot-plugin-item::shadow ::content > a {
     left: 0;
     bottom: 0;
     right: 0;
+}
+
+/* This stops transitions from overflowing onto other elements. */
+html /deep/ core-animated-pages {
+    overflow: hidden;
+}
+
+/* This stops menus keeping the last item clicked highlighted. */
+paper-item.core-selected {
+    background: inherit;
+}
+
+/* This styles divs like core-menus. */
+html /deep/ paper-dropdown > div {
+    margin: 12px;
+}
+
+/* This stops the main core-list having its own scrollbars. */
+#main > core-list {
+    overflow-y: initial !important;
+}
+
+/* This makes paper-menu-button icons align like paper-icon-buttons do. */
+html /deep/ paper-menu-button > paper-icon-button,
+html /deep/ core-tooltip > paper-icon-button,
+html /deep/ core-tooltip > core-icon {
+    display: block;
+}
+
+/* Center paper-dropdown-menu text better. */
+html /deep/ paper-dropdown-menu {
+    padding-top: 0;
+}
+
+/* This adds padding between icons and text in menus. */
+html /deep/ paper-item > core-icon {
+    margin-right: 1em;
+}
+
+/* This makes checkboxes have the same padding as icons in lists. */
+html /deep/ paper-checkbox::shadow #checkboxLabel {
+    padding-left: 1em;
 }
\ No newline at end of file
diff --git a/resources/report/css/style.css b/resources/report/css/style.css
index 203ff73c..b74b3ab0 100644
--- a/resources/report/css/style.css
+++ b/resources/report/css/style.css
@@ -30,46 +30,44 @@ body {
     background:#f8f8f8;
     height: 100%;
 }
-noscript {
-    background:#c00;
-    display:block;
-    padding:10px 5px;
-    color:white;
-}
 #mainToolbar {
     background: #4285f4;
-    /*font-size: 1em;
-    height: 3em;*/
-      color: white;
+    color: white;
 }
-/*#mainToolbar > * {
-    top: -1em;
-}*/
-#gameMenu {
-    background: inherit;
-}
-
-#filtersToggle > span {
-    margin-right: 1em;
+#mainToolbar paper-dropdown {
+    color: black;
 }
 
 div[drawer] > core-tooltip {
-    width: 100%;
     margin: 0 12px;
 }
-#searchBox {
-    width: calc(100% - 24px);
+div[drawer] {
+    z-index: 1;
 }
 #main {
-    overflow: auto;
+    overflow-y: auto;
+    overflow-x: hidden;
     position: relative;
+    z-index: 0;
 }
 #cardsNav {
     margin: 0;
     overflow: auto;
 }
 #cardsNav > paper-item, #cardsNav > loot-plugin-item {
-    height: 2em;
+    /*height: 2em;*/
+}
+paper-item > a {
+    text-decoration: none;
+    color: black;
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+}
+#searchBox {
+    display: block;
 }
 #container {
     position: fixed;
@@ -90,33 +88,9 @@ section {
     border-bottom-left-radius: 2px;
     box-shadow: rgba(0, 0, 0, 0.0980392) 0px 2px 4px, rgba(0, 0, 0, 0.0980392) 0px 0px 3px;
 }
-
-dialog {
-    border: 1px solid rgba(0, 0, 0, 0.3);
-    border-radius: 6px;
-    box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-    overflow:hidden;
-    padding: 2em;
-    top: 3em;
-    max-width: 40em;
-    max-height: calc(100% - 8em);
-    overflow: auto;
+#generalMessages {
+    margin-bottom: 0.5em;
 }
-dialog > h1 {
-    font-weight: normal;
-    text-align: center;
-}
-dialog[data-type=warn] > span:first-child  {
-    color: gold;
-}
-dialog button {
-    margin: 0.5em;
-}
-
-
-
-
-
 
 #about blockquote {
     white-space: pre;
@@ -153,11 +127,6 @@ section h1 {
     text-align:left;
     padding-left:0;
 }
-input[type='checkbox'] {
-    position:relative;
-    top:0.15em;
-    margin-left:0.5em;
-}
 ul {
     margin-top:0.5em;
     margin-bottom:0;
@@ -206,10 +175,6 @@ li.warn{
 paper-checkbox {
     padding: 0.5em 1em;
 }
-loot-dropdown-menu {
-    padding-left: 2em;
-    top: -0.25em;
-}
 
 input[readonly] {
     border: none;
@@ -220,24 +185,10 @@ td input {
     text-overflow: ellipsis;
 }
 
-body.editMode header {
-    color: #999;
-}
-body.editMode header #headerOverlay {
-    z-index: 3;
-    width: 100%;
-    height: 100%;
-    position: absolute;
-    top: 0;
-    left: 0;
-}
 [draggable] {
     -webkit-user-select: none;
     cursor: move;
 }
-.highlight {
-    outline: 3px solid #69aaff;
-}
 #applySortButton {
     box-shadow: none;
     outline: none;
@@ -252,53 +203,30 @@ input:valid {
     background-color: white;
     color: black;
 }
-#hoverText {
-    position: fixed;
-    z-index: 5;
-    background: white;
-    box-shadow:0 0 3px 0px rgba(0,0,0,0.5);
-    padding: 2px 5px;
+paper-progress {
+    width: 100%;
 }
-progress, .progress {
-    /* Reset the default appearance */
-    -webkit-appearance: none;
-    width: 250px;
-    height: 20px;
-    display: block;
-    margin: 0 auto;
-}
-#progressDialog > h1 {
-    font-size: 1.5em;
-}
-
-@-webkit-keyframes indeterminate {
-	0% { width: 0% }
-	100% { width: 100% }
-}
-
-progress::-webkit-progress-bar, .progress.bar {
-    background-color: #eee;
-    border-radius: 2px;
-    box-shadow: 0 2px 5px rgba(0, 0, 0, 0.25) inset;
-}
-progress::-webkit-progress-value, .progress .value {
-    height: 100%;
-    background-color: green;
-    -webkit-animation: indeterminate 2s linear 0 infinite alternate paused;
-}
-.progress.running > .value {
-    -webkit-animation-play-state: running;
-}
-
-:host > span {
-    display: inline-block;
-    width: 1.2em;
-}
-
 #firstRun > ul {
     list-style-type: disc;
     padding-left: 40px;
 }
 #firstRun .tag {
     margin: 0;
+}
+
+
+/* This animates the drawer toggle appearing in narrow view. */
+#drawerToggle {
+    opacity: 0;
+    visibility: hidden;
+    transition: opacity 0.5s;
+}
+@media screen and (max-width: 640px) {
+    #drawerToggle {
+        opacity: 1;
+        visibility: visible;
+    }
+}
+#settingsDialog > paper-checkbox {
+    display: block;
 }
\ No newline at end of file
diff --git a/resources/report/html/editable-table.html b/resources/report/html/editable-table.html
index 04ce34d6..7e91b5ed 100644
--- a/resources/report/html/editable-table.html
+++ b/resources/report/html/editable-table.html
@@ -1,76 +1,83 @@
 <link rel="import" href="../bower_components/polymer/polymer.html">
 <link rel="import" href="../bower_components/paper-input/paper-input.html">
+<link rel="import" href="../bower_components/paper-item/paper-item.html">
 <link rel="import" href="../bower_components/paper-icon-button/paper-icon-button.html">
 <link rel="import" href="../bower_components/core-icons/core-icons.html">
 
+<link rel="import" href="loot-dropdown-menu.html">
+<link rel="import" href="loot-validated-input.html">
+
 <template id="fileRow">
     <tr>
-        <td><input class="name" type="text" required></td>
-        <td><input class="display" type="text"></td>
-        <td><input class="condition" type="text"></td>
+        <td><loot-validated-input error="A filename is required." class="name" required></loot-validated-input></td>
+        <td><paper-input class="display"></paper-input></td>
+        <td><paper-input class="condition"></paper-input></td>
         <td><paper-icon-button class="delete" icon="delete"></paper-icon-button></td>
     </tr>
 </template>
 <template id="messageRow">
     <tr>
-        <td><select class="type">
-                <option value="say">Note</option>
-                <option value="warn">Warning</option>
-                <option value="error">Error</option>
-            </select>
+        <td>
+            <loot-dropdown-menu class="type" valueattr="value">
+                <paper-item value="say">Note</paper-item>
+                <paper-item value="warn">Warning</paper-item>
+                <paper-item value="error">Error</paper-item>
+            </loot-dropdown-menu>
         </td>
-        <td><input class="content" type="text" required></td>
-        <td><input class="condition" type="text"></td>
-        <td><select class="language">
+        <td><loot-validated-input error="A content string is required." class="content" required></loot-validated-input></td>
+        <td><paper-input class="condition"></paper-input></td>
+        <td>
+            <loot-dropdown-menu class="language" valueattr="value">
                 <!-- Language <option> elements go here. -->
-            </select>
+            </loot-dropdown-menu>
         </td>
         <td><paper-icon-button class="delete" icon="delete"></paper-icon-button></td>
     </tr>
 </template>
 <template id="tagRow">
     <tr>
-        <td><select class="type">
-                <option value="add">Add</option>
-                <option value="remove">Remove</option>
-            </select>
+        <td>
+            <loot-dropdown-menu class="type" valueattr="value">
+                <paper-item value="add">Add</paper-item>
+                <paper-item value="remove">Remove</paper-item>
+            </loot-dropdown-menu>
         </td>
-        <td><input class="name" type="text" required></td>
-        <td><input class="condition" type="text"></td>
+        <td><loot-validated-input error="A name is required." class="name" required></loot-validated-input></td>
+        <td><paper-input class="condition"></paper-input></td>
         <td><paper-icon-button class="delete" icon="delete"></paper-icon-button></td>
     </tr>
 </template>
 <template id="dirtyInfoRow">
     <tr>
-        <td><input class="crc" type="text" maxlength="8" minlength="8" pattern="[0-9A-Fa-f]{8}" required></td>
-        <td><input class="itm" type="number" min="0" step="1" value="0"></td>
-        <td><input class="udr" type="number" min="0" step="1" value="0"></td>
-        <td><input class="nav" type="number" min="0" step="1" value="0"></td>
-        <td><input class="util" type="text" required></td>
+        <td><loot-validated-input error="A CRC is required." class="crc" maxlength="8" minlength="8" pattern="[0-9A-Fa-f]{8}" required></loot-validated-input></td>
+        <td><loot-validated-input error="Values must be integers." class="itm" type="number" min="0" step="1" value="0"></loot-validated-input></td>
+        <td><loot-validated-input error="Values must be integers." class="udr" type="number" min="0" step="1" value="0"></loot-validated-input></td>
+        <td><loot-validated-input error="Values must be integers." class="nav" type="number" min="0" step="1" value="0"></loot-validated-input></td>
+        <td><loot-validated-input error="A utility name is required." class="util" required></loot-validated-input></td>
         <td><paper-icon-button class="delete" icon="delete"></paper-icon-button></td>
     </tr>
 </template>
 <template id="locationRow">
     <tr>
-        <td><input class="link" type="text" required></td>
-        <td><input class="ver" type="text"></td>
+        <td><loot-validated-input error="A link is required." class="link" required></loot-validated-input></td>
+        <td><paper-input class="ver"></paper-input></td>
         <td><paper-icon-button class="delete" icon="delete"></paper-icon-button></td>
     </tr>
 </template>
 <template id="gameRow">
     <tr>
-        <td><input class="name" type="text" required></td>
+        <td><loot-validated-input error="A name is required." class="name" required></loot-validated-input></td>
         <td>
-            <select class="type">
-            <!-- Game <option> elements go here. -->
-            </select>
+            <loot-dropdown-menu class="type" valueattr="value">
+                <!-- Game <option> elements go here. -->
+            </loot-dropdown-menu>
         </td>
-        <td><input class="folder" type="text" required></td>
-        <td><input class="master" type="text"></td>
-        <td><input class="repo" type="text"></td>
-        <td><input class="branch" type="text"></td>
-        <td><input class="path" type="text"></td>
-        <td><input class="registry" type="text"></td>
+        <td><loot-validated-input error="A folder is required." class="folder" required></loot-validated-input></td>
+        <td><paper-input class="master"></paper-input></td>
+        <td><paper-input class="repo"></paper-input></td>
+        <td><paper-input class="branch"></paper-input></td>
+        <td><paper-input class="path"></paper-input></td>
+        <td><paper-input class="registry"></paper-input></td>
         <td><paper-icon-button class="delete" icon="delete"></paper-icon-button></td>
     </tr>
 </template>
@@ -136,23 +143,18 @@ td paper-icon-button.hidden {
         getRowsData: {
             value: function(writableOnly) {
                 var writableRows = [];
-                var rows = this.tBodies[0].rows[0];
+                var rows = this.tBodies[0].rows;
 
                 for (var i = 0; i < rows.length; ++i) {
                     var trash = rows[i].getElementsByClassName('delete');
                     if (trash.length > 0 && (!writableOnly || !trash[0].classList.contains('hidden'))) {
                         var rowData = {};
 
-                        var inputs = rows[i].querySelectorAll('input, paper-input');
+                        var inputs = rows[i].querySelectorAll('paper-input, loot-validated-input, loot-dropdown-menu');
                         for (var j = 0; j < inputs.length; ++j) {
                             rowData[inputs[j].className] = inputs[j].value;
                         }
 
-                        var selects = rows[i].getElementsByTagName('select');
-                        for (var j = 0; j < selects.length; ++j) {
-                            rowData[selects[j].className] = selects[j].value;
-                        }
-
                         writableRows.push(rowData);
                     }
                 }
@@ -176,39 +178,17 @@ td paper-icon-button.hidden {
                     trash.classList.toggle('hidden', readOnly);
                 }
 
-                var inputs = row.querySelectorAll('input, paper-input');
+                var inputs = row.querySelectorAll('paper-input, loot-validated-input, loot-dropdown-menu');
                 for (var i = 0; i < inputs.length; ++i) {
                     if (classMask) {
                         for (var j = 0; j < classMask.length; ++j) {
                             if (inputs[i].classList.contains(classMask[j])) {
-                                if (inputs[i].tagName == 'PAPER-INPUT') {
-                                    inputs[i].readonly = readOnly;
-                                } else {
-                                    inputs[i].readOnly = readOnly;
-                                }
+                                inputs[i].disabled = readOnly;
                                 break;
                             }
                         }
                     } else {
-                        if (inputs[i].tagName == 'PAPER-INPUT') {
-                            inputs[i].disabled = readOnly;
-                        } else {
-                            inputs[i].readOnly = readOnly;
-                        }
-                    }
-                }
-
-                var selects = row.getElementsByTagName('select');
-                for (var i = 0; i < selects.length; ++i) {
-                    if (classMask) {
-                        for (var j = 0; j < classMask.length; ++j) {
-                            if (selects[i].classList.contains(classMask[j])) {
-                                selects[i].disabled = readOnly;
-                                break;
-                            }
-                        }
-                    } else {
-                        selects[i].disabled = readOnly;
+                        inputs[i].disabled = readOnly;
                     }
                 }
             }
diff --git a/resources/report/html/loot-dialog.html b/resources/report/html/loot-dialog.html
index 76abee47..19dc5227 100644
--- a/resources/report/html/loot-dialog.html
+++ b/resources/report/html/loot-dialog.html
@@ -9,35 +9,25 @@ Still missing compared to <dialog> are:
 -->
 
 <link rel="import" href="../bower_components/polymer/polymer.html">
-<link rel="import" href="../bower_components/paper-dialog/paper-dialog.html">
+<link rel="import" href="../bower_components/paper-dialog/paper-action-dialog.html">
 
-<polymer-element name="loot-dialog" extends="paper-dialog" attributes="open" transition="core-transition-center" autoCloseDisabled backdrop>
+<polymer-element name="loot-dialog" extends="paper-action-dialog" transition="core-transition-center" layered="false">
     <script>
     Polymer({
-        open: false,
-
-        openedChanged: function(oldValue, newValue) {
-            this.open = newValue;
-        },
-
-        openChanged: function(oldValue, newValue) {
-            this.opened = newValue;
-        },
-
         show: function() {
             this.backdrop = false;
-            this.opened = true;
-            this.layered = false;
+            this.autoCloseDisabled = false;
+            this.setAttribute(opened, true);
         },
         showModal: function() {
             this.backdrop = true;
-            this.opened = true;
-            // The layered attribute seems to cause the dialog to be destroyed for some reason, so don't use it. It doesn't seem to be necessary anyway.
-            this.layered = false;
+            this.autoCloseDisabled = true;
+            this.open();
+            this.setAttribute('opened', true);
         },
         close: function(retVal) {
             this.setAttribute('returnValue', retVal);
-            this.opened = false;
+            this.super();
         },
     });
     </script>
diff --git a/resources/report/html/loot-dropdown-menu.html b/resources/report/html/loot-dropdown-menu.html
index 5f3bad62..df5395b7 100644
--- a/resources/report/html/loot-dropdown-menu.html
+++ b/resources/report/html/loot-dropdown-menu.html
@@ -8,26 +8,41 @@ it a <select>-like API. This means:
 -->
 
 <link rel="import" href="../bower_components/polymer/polymer.html">
+<link rel="import" href="../bower_components/paper-dropdown/paper-dropdown.html">
 <link rel="import" href="../bower_components/paper-dropdown-menu/paper-dropdown-menu.html">
+<link rel="import" href="../bower_components/core-menu/core-menu.html">
 
-<polymer-element name="loot-dropdown-menu" extends="paper-dropdown-menu">
+<polymer-element name="loot-dropdown-menu">
     <template>
-        <shadow></shadow>
+        <paper-dropdown-menu disabled="{{disabled}}">
+            <paper-dropdown class="dropdown">
+                <core-menu valueattr="value">
+                    <content></content>
+                </core-menu>
+            </paper-dropdown>
+        </paper-dropdown-menu>
     </template>
     <script>
     Polymer({
         value: undefined,
+        disabled: false,
 
-        ready: function() {
-            this.valueattr = 'value';
+        attached: function() {
+            this.shadowRoot.firstElementChild.lastElementChild.firstElementChild.addEventListener('core-select', this.onItemSelect, false);
         },
 
-        selectedChanged: function(oldValue, newValue) {
-            this.value = newValue;
+        detached: function() {
+            this.shadowRoot.firstElementChild.lastElementChild.firstElementChild.removeEventListener('core-select', this.onItemSelect, false);
+        },
+
+        onItemSelect: function(evt) {
+            if (evt.detail.isSelected) {
+                evt.currentTarget.parentElement.parentElement.parentNode.host.value = evt.currentTarget.selected;
+            }
         },
 
         valueChanged: function(oldValue, newValue) {
-            this.selected = newValue;
+            this.shadowRoot.firstElementChild.lastElementChild.firstElementChild.selected = newValue;
         },
     });
     </script>
diff --git a/resources/report/html/loot-message-dialog.html b/resources/report/html/loot-message-dialog.html
index 01e52b22..5e7c32e6 100644
--- a/resources/report/html/loot-message-dialog.html
+++ b/resources/report/html/loot-message-dialog.html
@@ -13,6 +13,7 @@ was pressed.
 -->
 
 <link rel="import" href="../bower_components/polymer/polymer.html">
+<link rel="import" href="../bower_components/paper-button/paper-button.html">
 <link rel="import" href="loot-dialog.html">
 
 <polymer-element name="loot-message-dialog" extends="loot-dialog">
@@ -50,15 +51,15 @@ was pressed.
 
         showModal: function(title, text, closeCallback) {
             this.heading = title;
-            this.querySelector('#message').textContent = text;
+            this.querySelector('.message').textContent = text;
 
             this.closeCallback = closeCallback;
             this.super();
         },
 
-        ready: function() {
+        created: function() {
             var p = document.createElement('p');
-            p.id = 'message';
+            p.className = 'message';
             this.appendChild(p);
 
             var accept = document.createElement('paper-button');
diff --git a/resources/report/html/loot-plugin-card.html b/resources/report/html/loot-plugin-card.html
index 3d6ee1d9..3494e297 100644
--- a/resources/report/html/loot-plugin-card.html
+++ b/resources/report/html/loot-plugin-card.html
@@ -1,9 +1,5 @@
 <!-- Fires the following events:
 
-loot-editor-close
-  detail: boolean
-    True if the editor was closed using the Apply button.
-
 loot-editor-open
 
 loot-filter-conflicts
@@ -22,22 +18,21 @@ loot-clear-metadata
 <link rel="import" href="../bower_components/core-icons/core-icons.html">
 <link rel="import" href="../bower_components/paper-menu-button/paper-menu-button.html">
 <link rel="import" href="../bower_components/paper-item/paper-item.html">
+<link rel="import" href="../bower_components/paper-dropdown/paper-dropdown.html">
 <link rel="import" href="../bower_components/paper-checkbox/paper-checkbox.html">
-<link rel="import" href="../bower_components/paper-input/paper-input.html">
-<link rel="import" href="../bower_components/paper-tabs/paper-tabs.html">
-<link rel="import" href="../bower_components/paper-button/paper-button.html">
+<link rel="import" href="../bower_components/paper-icon-button/paper-icon-button.html">
 
-<link rel="import" href="editable-table.html">
+<link rel="import" href="loot-plugin-editor.html">
 
 
-<polymer-element name="loot-plugin-card">
+<polymer-element name="loot-plugin-card" attributes="data">
     <template>
         <style>
         /* Host and front/editor styling. */
-        :host {
+        #wrapper {
             display: block;
             background:white;
-            margin:1em;
+            margin: 0.5em 1em;
             position: relative;
             border-top-left-radius: 2px;
             border-top-right-radius: 2px;
@@ -48,13 +43,16 @@ loot-clear-metadata
             transition: 0.6s;
             transform-style: preserve-3d;
         }
-        :host([data-active=false]) .activeTick {
+        :host(.highlight) #wrapper {
+            outline: 3px solid #69aaff;
+        }
+        :host([data-active=false]) #activeTick {
             visibility: hidden;
         }
-        :host([data-bsa=false]) .loadsBSA {
+        :host([data-bsa=false]) #loadsBSA {
             display: none;
         }
-        :host([data-dummy=false]) .dummyPlugin {
+        :host([data-dummy=false]) #dummyPlugin {
             display: none;
         }
         :host([data-edits=false]) #hasUserEdits {
@@ -72,7 +70,7 @@ loot-clear-metadata
         }
 
         /* Flip animation styling. */
-        :host(.flip) {
+        :host(.flip) #wrapper {
             transform: rotateY(180deg);
         }
         :host(.flip) #front  {
@@ -81,9 +79,12 @@ loot-clear-metadata
         :host(.flip) #editor  {
             display: block;
         }
+        :host(.fastflip) #wrapper {
+            transition-duration: 1ms;
+        }
 
         /* Icon styling. */
-        .activeTick {
+        #activeTick {
             color: green;
         }
 
@@ -109,250 +110,83 @@ loot-clear-metadata
             display: none;
         }
 
-        /* Editor input styling. */
-        #editor > div > paper-checkbox, #editor > div > core-tooltip {
-            display: table;
-        }
-        #enableEdits {
-            margin-bottom: 1em;
-        }
-        #priorityValue {
-            margin-left: 0.5em;
-        }
-        input[readonly] {
-            border: none;
-            -webkit-user-select: none;
-        }
-        input:invalid {
-            background-color: pink;
-            color: white;
-        }
-
-        /* Table styling. */
-        table {
-            margin: 0;
-            border-collapse: collapse;
-            width: 100%;
-        }
-        td input {
-            width: 100%;
-            text-overflow: ellipsis;
-        }
-        td:last-child {
-            cursor: pointer;
-        }
-        td:last-child:hover {
-            color: red;
-        }
-        td, th {
-            vertical-align: top;
-            text-align: left;
-            padding: 0.5em;
-        }
-        th {
-            border-bottom: 1px black solid;
-        }
-        tbody tr:last-child {
-            cursor: pointer;
-            color: grey;
-        }
-        tbody tr:last-child:hover {
-            color: black;
-        }
-
         /* Misc Styling. */
         core-toolbar {
             background: white;
         }
-        #buttons {
-            text-align: right;
-        }
-        #editor > div {
-            padding: 1em;
-        }
-        paper-menu-button paper-item:first-child {
+        paper-item:first-child::shadow .button-content {
             padding: 0;
         }
-        #showOnlyConflicts {
-            height: 48px;
-            line-height: 48px;
-            padding: 0 16px;
+        paper-checkbox {
+            padding: 0.9em 1em;
         }
         </style>
-        <section id="front">
-            <core-toolbar>
-                <core-tooltip class="activeTick" label="Active Plugin">
-                    <core-icon icon="check"></core-icon>
-                </core-tooltip>
-                <content select="h1"></content>
-                <content select=".version"></content>
-                <span flex><content select=".crc"></content></span>
-                <core-tooltip class="dummyPlugin" label="Dummy Plugin">
-                    <core-icon icon="visibility-off"></core-icon>
-                </core-tooltip>
-                <core-tooltip class="loadsBSA" label="Loads BSA">
-                    <core-icon icon="attachment"></core-icon>
-                </core-tooltip>
-                <core-tooltip id="hasUserEdits" label="Has User Metadata">
-                    <core-icon icon="account-circle"></core-icon>
-                </core-tooltip>
-                <paper-menu-button icon="more-vert" halign="right">
-                    <paper-item>
-                        <paper-checkbox id="showOnlyConflicts" label="Show Only Conflicts" flex></paper-checkbox>
-                    </paper-item>
-                    <paper-item id="editMetadata" icon="create" label="Edit Metadata"></paper-item>
-                    <paper-item id="copyMetadata" icon="content-copy" label="Copy Metadata As Text"></paper-item>
-                    <paper-item id="clearMetadata" icon="delete" label="Clear User Metadata"></paper-item>
-                </paper-menu-button>
-            </core-toolbar>
-            <content select=".tag.add"></content>
-            <content select=".tag.remove"></content>
-            <content select="ul"></content>
-        </section>
-        <section id="editor">
-            <core-toolbar>
-                <core-tooltip class="activeTick" label="Active Plugin">
-                    <core-icon icon="check"></core-icon>
-                </core-tooltip>
-                <h1></h1>
-                <span class="version"></span>
-                <span class="crc" flex></span>
-                <core-tooltip class="dummyPlugin" label="Dummy Plugin">
-                    <core-icon icon="visibility-off"></core-icon>
-                </core-tooltip>
-                <core-tooltip class="loadsBSA" label="Loads BSA">
-                    <core-icon icon="attachment"></core-icon>
-                </core-tooltip>
-            </core-toolbar>
-            <div>
-                <paper-checkbox id="enableEdits" label="Enable Edits"></paper-checkbox>
-                <core-tooltip label="Global priorities are compared against all other plugins. Normal priorities are compared against only conflicting plugins." position="right">
-                    <paper-checkbox id="globalPriority" label="Global Priority"></paper-checkbox>
-                </core-tooltip>
-                <div horizontal layout center>
-                    <div>Priority Value</div>
-                    <paper-input type="number" id="priorityValue" max="999999" min="-999999" step="1" value="0" error="Input must be an integer!"></paper-input>
-                </div>
-                <div id="fileTabs">
-                    <paper-tabs selected="loadAfter" valueattr="data-for">
-                        <paper-tab data-for="loadAfter">Load After</paper-tab>
-                        <paper-tab data-for="req">Requirements</paper-tab>
-                        <paper-tab data-for="inc">Incompatibilities</paper-tab>
-                    </paper-tabs>
-                    <table is="editable-table" id="loadAfter" data-template="fileRow">
-                        <thead>
-                            <tr><th>Filename</th><th>Display Name</th><th>Condition</th><th></th></tr>
-                        </thead>
-                        <tbody>
-                            <!-- File rows go here. -->
-                            <tr><td colspan="4">Add new row...</td><td></td></tr>
-                        </tbody>
-                    </table>
-                    <table is="editable-table" id="req" class="hidden" data-template="fileRow">
-                        <thead>
-                            <tr><th>Filename</th><th>Display Name</th><th>Condition</th><th></th></tr>
-                        </thead>
-                        <tbody>
-                            <!-- File rows go here. -->
-                            <tr><td colspan="4">Add new row...</td><td></td></tr>
-                        </tbody>
-                    </table>
-                    <table is="editable-table" id="inc" class="hidden" data-template="fileRow">
-                        <thead>
-                            <tr><th>Filename</th><th>Display Name</th><th>Condition</th><th></th></tr>
-                        </thead>
-                        <tbody>
-                            <!-- File rows go here. -->
-                            <tr><td colspan="4">Add new row...</td><td></td></tr>
-                        </tbody>
-                    </table>
-                </div>
-                <div id="miscTabs">
-                    <paper-tabs selected="message" valueattr="data-for">
-                        <paper-tab data-for="message">Messages</paper-tab>
-                        <paper-tab data-for="tags">Bash Tags</paper-tab>
-                        <paper-tab data-for="dirty">Dirty Info</paper-tab>
-                        <paper-tab data-for="locations">Locations</paper-tab>
-                    </paper-tabs>
-                    <table is="editable-table" id="message" data-template="messageRow">
-                        <thead>
-                            <tr><th>Type</th><th>Content</th><th>Condition</th><th>Language</th><th></th></tr>
-                        </thead>
-                        <tbody>
-                            <!-- Message rows go here. -->
-                            <tr><td colspan="4">Add new row...</td><td></td></tr>
-                        </tbody>
-                    </table>
-                    <table is="editable-table" id="tags" class="hidden" data-template="tagRow">
-                        <thead>
-                            <tr><th>Add/Remove</th><th>Bash Tag</th><th>Condition</th><th></th></tr>
-                        </thead>
-                        <tbody>
-                            <!-- Bash Tag rows go here. -->
-                            <tr><td colspan="4">Add new row...</td><td></td></tr>
-                        </tbody>
-                    </table>
-                    <table is="editable-table" id="dirty" class="hidden" data-template="dirtyInfoRow">
-                        <thead>
-                            <tr><th>CRC</th><th>ITM Count</th><th>Deleted References</th><th>Deleted Navmeshes</th><th>Cleaning Utility</th><th></th></tr>
-                        </thead>
-                        <tbody>
-                            <!-- Dirty info rows go here. -->
-                            <tr><td colspan="4">Add new row...</td><td></td></tr>
-                        </tbody>
-                    </table>
-                    <table is="editable-table" id="locations" class="hidden" data-template="locationRow">
-                        <thead>
-                            <tr><th>URL</th><th>Version</th><th></th></tr>
-                        </thead>
-                        <tbody>
-                            <!-- Location rows go here. -->
-                            <tr><td colspan="3">Add new row...</td><td></td></tr>
-                        </tbody>
-                    </table>
-                </div>
-                <div id="buttons">
-                    <paper-button id="accept">Apply</paper-button>
-                    <paper-button id="cancel">Cancel</paper-button>
-                </div>
-            </div>
-        </section>
+        <div id="wrapper">
+            <section id="front">
+                <core-toolbar>
+                    <core-tooltip id="activeTick" label="Active Plugin">
+                        <core-icon icon="check"></core-icon>
+                    </core-tooltip>
+                    <content select="h1"></content>
+                    <content select=".version"></content>
+                    <span flex><content select=".crc"></content></span>
+                    <core-tooltip id="dummyPlugin" label="Dummy Plugin">
+                        <core-icon icon="visibility-off"></core-icon>
+                    </core-tooltip>
+                    <core-tooltip id="loadsBSA" label="Loads BSA">
+                        <core-icon icon="attachment"></core-icon>
+                    </core-tooltip>
+                    <core-tooltip id="hasUserEdits" label="Has User Metadata">
+                        <core-icon icon="account-circle"></core-icon>
+                    </core-tooltip>
+                    <paper-menu-button>
+                        <paper-icon-button icon="more-vert"></paper-icon-button>
+                        <paper-dropdown class="dropdown" halign="right" opened="{{data.isMenuOpen}}">
+                            <div>
+                                <paper-item>
+                                    <paper-checkbox id="showOnlyConflicts" label="Show Only Conflicts" checked="{{data.isConflictFilterChecked}}" flex></paper-checkbox>
+                                </paper-item>
+                                <paper-item id="editMetadata">
+                                    <core-icon icon="create"></core-icon>
+                                    Edit Metadata
+                                </paper-item>
+                                <paper-item id="copyMetadata">
+                                    <core-icon icon="content-copy"></core-icon>
+                                    Copy Metadata As Text
+                                </paper-item>
+                                <paper-item id="clearMetadata">
+                                    <core-icon icon="delete"></core-icon>
+                                    Clear User Metadata
+                                </paper-item>
+                            </div>
+                        </paper-dropdown>
+                    </paper-menu-button>
+                </core-toolbar>
+                <content select=".tag.add"></content>
+                <content select=".tag.remove"></content>
+                <content></content>
+            </section>
+            <loot-plugin-editor id="editor" data="{{data}}"></loot-plugin-editor>
+        </div>
     </template>
     <script>
     Polymer({
-        created: function() {
-            var h1 = document.createElement('h1');
-            this.appendChild(h1);
-            var crc = document.createElement('div');
-            crc.className = 'crc';
-            this.appendChild(crc);
-            var version = document.createElement('div');
-            version.className = 'version';
-            this.appendChild(version);
+        data: undefined,
 
-            var tagAdd = document.createElement('div');
-            tagAdd.className = 'tag add';
-            this.appendChild(tagAdd);
-            var tagRemove = document.createElement('div');
-            tagRemove.className = 'tag remove';
-            this.appendChild(tagRemove);
-
-            var messages = document.createElement('ul');
-            this.appendChild(messages);
+        observe: {
+            'data.crc': 'onCrcChange',
+            'data.tags': 'onTagsChange',
+            'data.messages': 'onMessagesChange'
         },
 
         attached: function() {
-            this.shadowRoot.getElementById('fileTabs').firstElementChild.addEventListener('core-select', this.onShowEditorTable, false);
-            this.shadowRoot.getElementById('miscTabs').firstElementChild.addEventListener('core-select', this.onShowEditorTable, false);
-
-            this.shadowRoot.getElementById('accept').addEventListener('click', this.onHideEditor, false);
-            this.shadowRoot.getElementById('cancel').addEventListener('click', this.onHideEditor, false);
-
             this.shadowRoot.getElementById('showOnlyConflicts').addEventListener('change', this.onShowOnlyConflicts, false);
             this.shadowRoot.getElementById('editMetadata').addEventListener('click', this.onShowEditor, false);
             this.shadowRoot.getElementById('copyMetadata').addEventListener('click', this.onCopyMetadata, false);
             this.shadowRoot.getElementById('clearMetadata').addEventListener('click', this.onClearMetadata, false);
 
+            this.addEventListener('transitionend', this.onFlipEnd, false);
+
             /* Because of the 3D flip effect used when accessing the editor,
                plugin menus get hidden underneath later plugin cards unless
                those cards have a lower z-index than the card the menu is part
@@ -368,308 +202,104 @@ loot-clear-metadata
         },
 
         detached: function() {
-            this.shadowRoot.getElementById('fileTabs').firstElementChild.removeEventListener('core-select', this.onShowEditorTable, false);
-            this.shadowRoot.getElementById('miscTabs').firstElementChild.removeEventListener('core-select', this.onShowEditorTable, false);
-
-            this.shadowRoot.getElementById('accept').removeEventListener('click', this.onHideEditor, false);
-            this.shadowRoot.getElementById('cancel').removeEventListener('click', this.onHideEditor, false);
-
             this.shadowRoot.getElementById('showOnlyConflicts').removeEventListener('change', this.onShowOnlyConflicts, false);
             this.shadowRoot.getElementById('editMetadata').removeEventListener('click', this.onShowEditor, false);
             this.shadowRoot.getElementById('copyMetadata').removeEventListener('click', this.onCopyMetadata, false);
             this.shadowRoot.getElementById('clearMetadata').addEventListener('click', this.onClearMetadata, false);
         },
 
-        ready: function() {
-            var editor = this.shadowRoot.getElementById('editor');
+        dataChanged: function(oldValue, newValue) {
+            /* Share the data with the editor. */
+            this.shadowRoot.getElementById('editor').data = this.data;
+            if (newValue != undefined) {
+                /* Set the card flip state. */
+                if (this.classList.contains('flip') != this.data.isEditorOpen) {
+                    /* Temporarily speed up the flip effect, as otherwise fast
+                       scrolling lets the user see the end of it. */
+                    this.classList.add('fastflip');
+                    this.classList.toggle('flip');
+                }
 
-            editor.querySelector('h1').textContent = this.querySelector('h1').textContent;
-            editor.querySelector('.version').textContent = this.querySelector('.version').textContent;
-            editor.querySelector('.crc').textContent = this.querySelector('.crc').textContent;
+                /* Also initialise the non-simple-string data. */
+                this.onCrcChange();
+                this.onTagsChange();
+                this.onMessagesChange();
+
+                /* Also set highlight if the conflict filter is active. */
+                this.classList.toggle('highlight', this.data.isConflictFilterChecked);
+            }
+        },
+
+        onCrcChange: function(oldValue, newValue) {
+            if (this.data) {
+                this.getElementsByClassName('crc')[0].textContent = this.data.getCrcString();
+            } else {
+                this.getElementsByClassName('crc')[0].textContent = '';
+            }
+        },
+
+        onTagsChange: function(oldValue, newValue) {
+            var tags;
+            if (this.data) {
+                tags = this.data.getTagStrings();
+            } else {
+                tags = {
+                    added: [],
+                    removed: []
+                };
+            }
+            this.getElementsByClassName('tag add')[0].textContent = tags.added;
+            this.getElementsByClassName('tag add')[0].classList.toggle('hidden', tags.added.length == 0);
+            this.getElementsByClassName('tag remove')[0].textContent = tags.removed;
+            this.getElementsByClassName('tag remove')[0].classList.toggle('hidden', tags.removed.length == 0);
+        },
+
+        onMessagesChange: function(oldValue, newValue) {
+            /* First clear any existing messages. */
+            var messageUL = this.getElementsByTagName('ul')[0];
+            while(messageUL.firstElementChild) {
+                messageUL.removeChild(messageUL.firstElementChild);
+            }
+            if (this.data) {
+                var messages = this.data.getUIMessages();
+                for (var i = 0; i < messages.length; ++i) {
+                    messageUL.appendChild(messages[i]);
+                }
+                messageUL.classList.toggle('hidden', messages.length == 0);
+            }
         },
 
         getName: function() {
             return this.getElementsByTagName('h1')[0].textContent;
         },
 
-        onShowEditorTable: function(evt) {
-            var tables = evt.target.parentElement.getElementsByTagName('table');
-            for (var i = 0; i < tables.length; ++i) {
-                if (tables[i].id != evt.target.selected) {
-                    tables[i].classList.toggle('hidden', true);
-                } else {
-                    tables[i].classList.toggle('hidden', false);
-                }
-            }
-        },
+        onFlipEnd: function(evt) {
+            /* Remove fastflip class if present. */
+            this.classList.remove('fastflip');
 
-        readFromEditor: function(oldData) {
-            /* Need to turn all the editor controls' values into data to
-               process. The control values can be compared with the existing
-               values to determine what's been changed, and masterlist rows in
-               the tables can be ignored because they're immutable. */
+            /* Re-calculate tooltip positions, since the flip animation tends to mess with them. */
+            this.shadowRoot.getElementById('activeTick').setPosition();
+            this.shadowRoot.getElementById('dummyPlugin').setPosition();
+            this.shadowRoot.getElementById('hasUserEdits').setPosition();
+            this.shadowRoot.getElementById('loadsBSA').setPosition();
 
-            var plugin = {
-                name: this.getElementsByTagName('h1')[0].textContent,
-                userlist: {},
-            };
-
-            if (oldData.id == this.id) {
-
-                /* If either of the priority values have been changed, the
-                   base priority value they're derived from will have
-                   changed, so record both. */
-                if (this.shadowRoot.getElementById('globalPriority').checked != oldData.isGlobalPriority
-                    || this.shadowRoot.getElementById('priorityValue').value != oldData.modPriority) {
-                    plugin.isGlobalPriority = this.shadowRoot.getElementById('globalPriority').checked;
-                    plugin.modPriority = this.shadowRoot.getElementById('priorityValue').value;
-                }
-
-                plugin.userlist.enabled = this.shadowRoot.getElementById('enableEdits').checked;
-
-                var tables = this.shadowRoot.getElementsByTagName('table');
-                for (var j = 0; j < tables.length; ++j) {
-                    var rowsData = tables[j].getRowsData(true);
-                    if (rowsData.length > 0) {
-                        if (tables[j].id == 'loadAfter') {
-                            plugin.userlist.after = rowsData;
-                        } else if (tables[j].id == 'req') {
-                            plugin.userlist.req = rowsData;
-                        } else if (tables[j].id == 'inc') {
-                            plugin.userlist.inc = rowsData;
-                        } else if (tables[j].id == 'message') {
-                            rowsData.forEach(function(data){
-                                data.content = [{
-                                    str: data.content,
-                                    lang: data.language
-                                }]
-                                delete data.language;
-                            });
-                            plugin.userlist.msg = rowsData;
-                        } else if (tables[j].id == 'tags') {
-                            rowsData.forEach(function(data){
-                                data = oldData.convTagObj(data);
-                            });
-                            plugin.userlist.tag = rowsData;
-                        } else if (tables[j].id == 'dirty') {
-                            rowsData.forEach(function(data){
-                                data.crc = parseInt(data.crc, 16);
-                            });
-                            plugin.userlist.dirty = rowsData;
-                        } else if (tables[j].id == 'locations') {
-                            rowsData.forEach(function(data){
-                                /* User metadata can only specify one version, but it should be a list. */
-                                if (data.ver.length > 0) {
-                                    data.ver = [
-                                        data.ver
-                                    ];
-                                } else {
-                                    delete data.ver;
-                                }
-                            });
-                            plugin.userlist.url = rowsData;
-                        }
-                    }
-                }
-            }
-            return plugin;
-        },
-
-        onHideEditor: function(evt) {
-            var card = evt.target.parentElement.parentElement.parentElement.parentNode.host;
-
-            /* First validate table inputs. */
-            var isValid = true;
-            var inputs = evt.target.parentElement.parentElement.getElementsByTagName('input');
-            for (var i = 0; i < inputs.length; ++i) {
-                if (!inputs[i].checkValidity()) {
-                    isValid = false;
-                    console.log(inputs[i]);
-                }
-            }
-
-            if (isValid || evt.target-id != 'accept') {
-                /* Fire the close event, saying whether or not to save data. */
-                card.dispatchEvent(new CustomEvent('loot-editor-close', {
-                    bubbles: true,
-                    detail: (evt.target.id == 'accept'),
-                }));
-                card.classList.toggle('flip');
-            }
-        },
-
-        onTransitionEnd: function(evt) {
-            evt.target.removeEventListener('transitionend', evt.target.onTransitionEnd, false);
-            evt.target.shadowRoot.getElementById('editMetadata').parentElement.shadowRoot.getElementById('dropdown').style.display = 'none';
+            /* Also re-calculate editor tooltip positions. */
+            this.shadowRoot.getElementById('editor').setTooltipPositions();
         },
 
         onShowEditor: function(evt) {
-            var card = evt.target.parentElement.parentElement.parentElement.parentNode.host;
+            var card = evt.target.parentElement.parentElement.parentElement.parentElement.parentElement.parentElement.parentNode.host;
+
+            card.data.isEditorOpen = true;
 
             /* Fire an open event, so that the UI can enter edit mode. */
             card.dispatchEvent(new CustomEvent('loot-editor-open', {
                 bubbles: true,
             }));
-
-            /* There's a bug where the hiding of the front panel interferes somehow with the
-               menu getting hidden, so do that manually once the transition ends. */
-            card.addEventListener('transitionend', card.onTransitionEnd, false);
-
-            /* Now show editor. */
-            card.classList.toggle('flip');
         },
 
-        setEditorData: function(data) {
-            this.shadowRoot.getElementById('editor').getElementsByTagName('h1')[0].textContent = data.name;
-            this.shadowRoot.getElementById('editor').getElementsByClassName('version')[0].textContent = data.version;
-            if (data.crc != '0') {
-                this.shadowRoot.getElementById('editor').getElementsByClassName('crc')[0].textContent = data.crc.toString(16).toUpperCase();
-            }
-
-            /* Fill in the editor input values. */
-            if (data.userlist && !data.userlist.enabled) {
-                this.shadowRoot.getElementById('enableEdits').checked = false;
-            } else {
-                this.shadowRoot.getElementById('enableEdits').checked = true;
-            }
-            this.shadowRoot.getElementById('globalPriority').checked = data.isGlobalPriority;
-            this.shadowRoot.getElementById('priorityValue').value = data.modPriority;
-
-            /* Clear any existing editor table data. Don't remove the last row though,
-               that's the "add new row" one. */
-            var tables = this.shadowRoot.getElementsByTagName('table');
-            for (var j = 0; j < tables.length; ++j) {
-                tables[j].clear();
-            }
-
-            /* Fill in editor table data. Masterlist-originated rows should have
-               their contents made read-only, and be unremovable. */
-            var tables = this.shadowRoot.getElementsByTagName('table');
-            for (var j = 0; j < tables.length; ++j) {
-                if (tables[j].id == 'loadAfter') {
-
-                    if (data.masterlist && data.masterlist.after) {
-                        data.masterlist.after.forEach(function(file) {
-                            var row = tables[j].addRow(file);
-                            tables[j].setReadOnly(row);
-                        });
-                    }
-                    if (data.userlist && data.userlist.after) {
-                        data.userlist.after.forEach(function(file) {
-                            tables[j].addRow(file);
-                        });
-                    }
-
-                } else if (tables[j].id == 'req') {
-
-                    if (data.masterlist && data.masterlist.req) {
-                        data.masterlist.req.forEach(function(file) {
-                            var row = tables[j].addRow(file);
-                            tables[j].setReadOnly(row);
-                        });
-                    }
-                    if (data.userlist && data.userlist.req) {
-                        data.userlist.req.forEach(function(file) {
-                            tables[j].addRow(file);
-                        });
-                    }
-
-                } else if (tables[j].id == 'inc') {
-
-                    if (data.masterlist && data.masterlist.inc) {
-                        data.masterlist.inc.forEach(function(file) {
-                            var row = tables[j].addRow(file);
-                            tables[j].setReadOnly(row);
-                        });
-                    }
-                    if (data.userlist && data.userlist.inc) {
-                        data.userlist.inc.forEach(function(file) {
-                            tables[j].addRow(file);
-                        });
-                    }
-
-                } else if (tables[j].id == 'message') {
-
-                    if (data.masterlist && data.masterlist.msg) {
-                        data.masterlist.msg.forEach(function(message) {
-                            var data = {
-                                type: message.type,
-                                content: message.content[0].str,
-                                condition: message.condition,
-                                language: message.content[0].lang
-                            };
-                            var row = tables[j].addRow(data);
-                            tables[j].setReadOnly(row);
-
-                        });
-                    }
-                    if (data.userlist && data.userlist.msg) {
-                        data.userlist.msg.forEach(function(message) {
-                            var data = {
-                                type: message.type,
-                                content: message.content[0].str,
-                                condition: message.condition,
-                                language: message.content[0].lang
-                            };
-                            tables[j].addRow(data);
-                        });
-                    }
-
-                } else if (tables[j].id == 'tags') {
-
-                    if (data.masterlist && data.masterlist.tag) {
-                        data.masterlist.tag.forEach(function(tag) {
-                            var data = data.convTagObj(tag);
-                            var row = tables[j].addRow(data);
-                            tables[j].setReadOnly(row);
-                        }, data);
-                    }
-                    if (data.userlist && data.userlist.tag) {
-                        data.userlist.tag.forEach(function(tag) {
-                            var data = data.convTagObj(tag);
-                            tables[j].addRow(data);
-                        }, data);
-                    }
-
-                } else if (tables[j].id == 'dirty') {
-
-                    if (data.masterlist && data.masterlist.dirty) {
-                        data.masterlist.dirty.forEach(function(info) {
-                            info.crc = info.crc.toString(16).toUpperCase();
-                            var row = tables[j].addRow(info);
-                            tables[j].setReadOnly(row);
-                        });
-                    }
-                    if (data.userlist && data.userlist.dirty) {
-                        data.userlist.dirty.forEach(function(info) {
-                            info.crc = info.crc.toString(16).toUpperCase();
-                            tables[j].addRow(info);
-                        });
-                    }
-
-                } else if (tables[j].id == 'locations') {
-
-                    if (data.masterlist && data.masterlist.url) {
-                        data.masterlist.url.forEach(function(location) {
-                            var temp = location;
-                            if (temp.ver) {
-                                temp.ver = temp.ver[0];
-                            }
-                            var row = tables[j].addRow(temp);
-                            tables[j].setReadOnly(row);
-                        });
-                    }
-                    if (data.userlist && data.userlist.url) {
-                        data.userlist.url.forEach(function(location) {
-                            var temp = location;
-                            if (temp.ver) {
-                                temp.ver = temp.ver[0];
-                            }
-                            tables[j].addRow(temp);
-                        });
-                    }
-                }
-            }
+        readFromEditor: function(oldData) {
+            return this.shadowRoot.getElementById('editor').readFromEditor(oldData);
         },
 
         deactivateConflictFilter: function() {
diff --git a/resources/report/html/loot-plugin-editor.html b/resources/report/html/loot-plugin-editor.html
new file mode 100644
index 00000000..89a9904d
--- /dev/null
+++ b/resources/report/html/loot-plugin-editor.html
@@ -0,0 +1,535 @@
+<!-- Fires the following events:
+
+loot-editor-close
+  detail: boolean
+    True if the editor was closed using the Apply button.
+
+--->
+
+<link rel="import" href="../bower_components/polymer/polymer.html">
+<link rel="import" href="../bower_components/core-toolbar/core-toolbar.html">
+<link rel="import" href="../bower_components/core-tooltip/core-tooltip.html">
+<link rel="import" href="../bower_components/core-icon/core-icon.html">
+<link rel="import" href="../bower_components/core-icons/core-icons.html">
+<link rel="import" href="../bower_components/paper-checkbox/paper-checkbox.html">
+<link rel="import" href="../bower_components/paper-input/paper-input.html">
+<link rel="import" href="../bower_components/paper-input/paper-input-decorator.html">
+<link rel="import" href="../bower_components/paper-tabs/paper-tabs.html">
+<link rel="import" href="../bower_components/paper-button/paper-button.html">
+<link rel="import" href="../bower_components/core-selector/core-selector.html">
+
+<link rel="import" href="editable-table.html">
+
+<polymer-element name="loot-plugin-editor" attributes="{{data}}">
+    <template>
+        <style>
+        /* Icon styling. */
+        :host-context(loot-plugin-card[data-active=false]) #activeTick {
+            visibility: hidden;
+        }
+        :host-context(loot-plugin-card[data-bsa=false]) #loadsBSA {
+            display: none;
+        }
+        :host-context(loot-plugin-card[data-dummy=false]) #dummyPlugin {
+            display: none;
+        }
+        #activeTick {
+            color: green;
+        }
+
+        /* Content styling. */
+        h1 {
+            font-weight: normal;
+            font-size: 1em;
+        }
+        .version {
+            display: inline-block;
+            margin-left: 1em;
+            color:#6394F8;
+        }
+        .crc {
+            display: inline-block;
+            margin-left: 1em;
+            color:#BC8923;
+        }
+        .hidden {
+            display: none;
+        }
+
+        /* Editor input styling. */
+        #editor > div > paper-checkbox, #editor > div > core-tooltip {
+            display: table;
+        }
+        #enableEdits {
+            margin-bottom: 1em;
+        }
+        #priorityValue {
+            margin-left: 0.5em;
+        }
+        input[readonly] {
+            border: none;
+            -webkit-user-select: none;
+        }
+        input:invalid {
+            background-color: pink;
+            color: white;
+        }
+
+        /* Table styling. */
+        table {
+            margin: 0;
+            border-collapse: collapse;
+            width: 100%;
+        }
+        table:not(.core-selected) {
+            display: none;
+        }
+        td input {
+            width: 100%;
+            text-overflow: ellipsis;
+        }
+        td:last-child {
+            cursor: pointer;
+        }
+        td:last-child:hover {
+            color: red;
+        }
+        td, th {
+            vertical-align: top;
+            text-align: left;
+            padding: 0.5em;
+        }
+        th {
+            border-bottom: 1px black solid;
+        }
+        tbody tr:last-child {
+            cursor: pointer;
+            color: grey;
+        }
+        tbody tr:last-child:hover {
+            color: black;
+        }
+
+        /* Misc Styling. */
+        core-toolbar {
+            background: white;
+        }
+        #buttons {
+            text-align: right;
+        }
+        main {
+            padding: 1em;
+        }
+        main > core-tooltip, main > paper-checkbox {
+            display: table;
+        }
+        </style>
+        <core-toolbar>
+            <core-tooltip id="activeTick" label="Active Plugin">
+                <core-icon icon="check"></core-icon>
+            </core-tooltip>
+            <h1>{{data.name}}</h1>
+            <span class="version">{{data.version}}</span>
+            <span class="crc" flex>{{data.crc}}</span>
+            <core-tooltip id="dummyPlugin" label="Dummy Plugin">
+                <core-icon icon="visibility-off"></core-icon>
+            </core-tooltip>
+            <core-tooltip id="loadsBSA" label="Loads BSA">
+                <core-icon icon="attachment"></core-icon>
+            </core-tooltip>
+        </core-toolbar>
+        <main>
+            <paper-checkbox id="enableEdits" label="Enable Edits"></paper-checkbox>
+            <core-tooltip label="Global priorities are compared against all other plugins. Normal priorities are compared against only conflicting plugins." position="right">
+                <paper-checkbox id="globalPriority" label="Global Priority"></paper-checkbox>
+            </core-tooltip>
+            <div horizontal layout center>
+                <div>Priority Value</div>
+                <paper-input-decorator>
+                    <input id="priorityValue" is="core-input" type="number" max="999999" min="-999999" step="1" preventInvalidInput>
+                </paper-input-decorator>
+            </div>
+            <div id="tableTabs">
+                <paper-tabs selected="loadAfter" valueattr="data-for" scrollable>
+                    <paper-tab data-for="loadAfter">Load After</paper-tab>
+                    <paper-tab data-for="req">Requirements</paper-tab>
+                    <paper-tab data-for="inc">Incompatibilities</paper-tab>
+                    <paper-tab data-for="message">Messages</paper-tab>
+                    <paper-tab data-for="tags">Bash Tags</paper-tab>
+                    <paper-tab data-for="dirty">Dirty Info</paper-tab>
+                    <paper-tab data-for="locations">Locations</paper-tab>
+                </paper-tabs>
+                <core-selector selected="loadAfter" valueattr="id">
+                    <table is="editable-table" id="loadAfter" data-template="fileRow">
+                        <thead>
+                            <tr><th>Filename</th><th>Display Name</th><th>Condition</th><th></th></tr>
+                        </thead>
+                        <tbody>
+                            <!-- File rows go here. -->
+                            <tr><td colspan="4">Add new row...</td><td></td></tr>
+                        </tbody>
+                    </table>
+                    <table is="editable-table" id="req" data-template="fileRow">
+                        <thead>
+                            <tr><th>Filename</th><th>Display Name</th><th>Condition</th><th></th></tr>
+                        </thead>
+                        <tbody>
+                            <!-- File rows go here. -->
+                            <tr><td colspan="4">Add new row...</td><td></td></tr>
+                        </tbody>
+                    </table>
+                    <table is="editable-table" id="inc" data-template="fileRow">
+                        <thead>
+                            <tr><th>Filename</th><th>Display Name</th><th>Condition</th><th></th></tr>
+                        </thead>
+                        <tbody>
+                            <!-- File rows go here. -->
+                            <tr><td colspan="4">Add new row...</td><td></td></tr>
+                        </tbody>
+                    </table>
+                    <table is="editable-table" id="message" data-template="messageRow">
+                        <thead>
+                            <tr><th>Type</th><th>Content</th><th>Condition</th><th>Language</th><th></th></tr>
+                        </thead>
+                        <tbody>
+                            <!-- Message rows go here. -->
+                            <tr><td colspan="4">Add new row...</td><td></td></tr>
+                        </tbody>
+                    </table>
+                    <table is="editable-table" id="tags" data-template="tagRow">
+                        <thead>
+                            <tr><th>Add/Remove</th><th>Bash Tag</th><th>Condition</th><th></th></tr>
+                        </thead>
+                        <tbody>
+                            <!-- Bash Tag rows go here. -->
+                            <tr><td colspan="4">Add new row...</td><td></td></tr>
+                        </tbody>
+                    </table>
+                    <table is="editable-table" id="dirty" data-template="dirtyInfoRow">
+                        <thead>
+                            <tr><th>CRC</th><th>ITM Count</th><th>Deleted References</th><th>Deleted Navmeshes</th><th>Cleaning Utility</th><th></th></tr>
+                        </thead>
+                        <tbody>
+                            <!-- Dirty info rows go here. -->
+                            <tr><td colspan="4">Add new row...</td><td></td></tr>
+                        </tbody>
+                    </table>
+                    <table is="editable-table" id="locations" data-template="locationRow">
+                        <thead>
+                            <tr><th>URL</th><th>Version</th><th></th></tr>
+                        </thead>
+                        <tbody>
+                            <!-- Location rows go here. -->
+                            <tr><td colspan="3">Add new row...</td><td></td></tr>
+                        </tbody>
+                    </table>
+                </core-selector>
+            </div>
+            <div id="buttons">
+                <paper-button id="accept">Apply</paper-button>
+                <paper-button id="cancel">Cancel</paper-button>
+            </div>
+        </main>
+    </template>
+    <script>
+    Polymer({
+        attached: function() {
+            this.shadowRoot.getElementById('tableTabs').firstElementChild.addEventListener('core-select', this.onTabSelect, false);
+
+            this.shadowRoot.getElementById('accept').addEventListener('click', this.onHideEditor, false);
+            this.shadowRoot.getElementById('cancel').addEventListener('click', this.onHideEditor, false);
+
+            /* Need to set the table tab height explicitly, so set it to the tallest table. */
+        },
+
+        detached: function() {
+            this.shadowRoot.getElementById('tableTabs').firstElementChild.removeEventListener('core-select', this.onTabSelect, false);
+
+            this.shadowRoot.getElementById('accept').removeEventListener('click', this.onHideEditor, false);
+            this.shadowRoot.getElementById('cancel').removeEventListener('click', this.onHideEditor, false);
+        },
+
+        onTabSelect: function(evt) {
+            if (evt.detail.isSelected) {
+                evt.target.nextElementSibling.selected = evt.target.selected;
+            }
+        },
+
+        dataChanged: function(oldValue, newValue) {
+            /* Record the current editor data. This is only strictly necessary
+               if the editor is currently open, but editor state isn't yet recorded. */
+            if (oldValue) {
+                oldValue.editor = this.readFromEditor(oldValue);
+            }
+
+            if (newValue) {
+                /* Set the new editor data. */
+                this.setEditorData(newValue);
+                this.shadowRoot.getElementsByClassName('crc')[0].textContent = this.data.getCrcString();
+            } else {
+                this.shadowRoot.getElementsByClassName('crc')[0].textContent = '';
+            }
+        },
+
+        readFromEditor: function(oldData) {
+            /* Need to turn all the editor controls' values into data to
+               process. The control values can be compared with the existing
+               values to determine what's been changed, and masterlist rows in
+               the tables can be ignored because they're immutable. */
+
+            var plugin = {
+                name: this.shadowRoot.getElementsByTagName('h1')[0].textContent,
+                userlist: {},
+            };
+
+            /* If either of the priority values have been changed, the
+               base priority value they're derived from will have
+               changed, so record both. */
+            if (this.shadowRoot.getElementById('globalPriority').checked != oldData.isGlobalPriority
+                || this.shadowRoot.getElementById('priorityValue').value != oldData.modPriority) {
+                plugin.isGlobalPriority = this.shadowRoot.getElementById('globalPriority').checked;
+                plugin.modPriority = this.shadowRoot.getElementById('priorityValue').value;
+            }
+
+            plugin.userlist.enabled = this.shadowRoot.getElementById('enableEdits').checked;
+
+            var tables = this.shadowRoot.getElementsByTagName('table');
+            for (var j = 0; j < tables.length; ++j) {
+                var rowsData = tables[j].getRowsData(true);
+                if (rowsData.length > 0) {
+                    if (tables[j].id == 'loadAfter') {
+                        plugin.userlist.after = rowsData;
+                    } else if (tables[j].id == 'req') {
+                        plugin.userlist.req = rowsData;
+                    } else if (tables[j].id == 'inc') {
+                        plugin.userlist.inc = rowsData;
+                    } else if (tables[j].id == 'message') {
+                        rowsData.forEach(function(data){
+                            data.content = [{
+                                str: data.content,
+                                lang: data.language
+                            }]
+                            delete data.language;
+                        });
+                        plugin.userlist.msg = rowsData;
+                    } else if (tables[j].id == 'tags') {
+                        rowsData.forEach(function(data){
+                            data = oldData.convTagObj(data);
+                        });
+                        plugin.userlist.tag = rowsData;
+                    } else if (tables[j].id == 'dirty') {
+                        rowsData.forEach(function(data){
+                            data.crc = parseInt(data.crc, 16);
+                        });
+                        plugin.userlist.dirty = rowsData;
+                    } else if (tables[j].id == 'locations') {
+                        rowsData.forEach(function(data){
+                            /* User metadata can only specify one version, but it should be a list. */
+                            if (data.ver.length > 0) {
+                                data.ver = [
+                                    data.ver
+                                ];
+                            } else {
+                                delete data.ver;
+                            }
+                        });
+                        plugin.userlist.url = rowsData;
+                    }
+                }
+            }
+
+            return plugin;
+        },
+
+        onHideEditor: function(evt) {
+            /* First validate table inputs. */
+            var isValid = true;
+            var inputs = evt.target.parentElement.parentElement.getElementsByTagName('input');
+            for (var i = 0; i < inputs.length; ++i) {
+                if (!inputs[i].checkValidity()) {
+                    isValid = false;
+                    console.log(inputs[i]);
+                }
+            }
+
+            if (isValid || evt.target.id != 'accept') {
+                /* Fire the close event, saying whether or not to save data. */
+                evt.target.dispatchEvent(new CustomEvent('loot-editor-close', {
+                    bubbles: true,
+                    detail: (evt.target.id == 'accept'),
+                }));
+
+                evt.target.parentElement.parentElement.parentNode.host.data.isEditorOpen = false;
+            }
+        },
+
+        setEditorData: function(newData) {
+            /* newData is a Plugin object reference. There may be existing
+               recorded data from a previous instance of the editor, so use
+               that for userlist and priority data if so. */
+            var tempData = {};
+            if (newData.editor) {
+                if (newData.editor.isGlobalPriority) {
+                    tempData.isGlobalPriority = newData.editor.isGlobalPriority;
+                }
+                if (newData.editor.modPriority) {
+                    tempData.modPriority = newData.editor.modPriority;
+                }
+                tempData.userlist = newData.editor.userlist;
+            } else {
+                tempData = {
+                    isGlobalPriority: newData.isGlobalPriority,
+                    modPriority: newData.modPriority,
+                    userlist: newData.userlist
+                }
+            }
+
+            /* Fill in the editor input values. */
+            if (tempData.userlist && !tempData.userlist.enabled) {
+                this.shadowRoot.getElementById('enableEdits').checked = false;
+            } else {
+                this.shadowRoot.getElementById('enableEdits').checked = true;
+            }
+            this.shadowRoot.getElementById('globalPriority').checked = tempData.isGlobalPriority;
+            this.shadowRoot.getElementById('priorityValue').value = tempData.modPriority;
+
+            /* Clear then fill in editor table data. Masterlist-originated
+               rows should have their contents made read-only. */
+            var tables = this.shadowRoot.getElementsByTagName('table');
+            for (var j = 0; j < tables.length; ++j) {
+                tables[j].clear();
+                if (tables[j].id == 'loadAfter') {
+
+                    if (newData.masterlist && newData.masterlist.after) {
+                        newData.masterlist.after.forEach(function(file) {
+                            var row = tables[j].addRow(file);
+                            tables[j].setReadOnly(row);
+                        });
+                    }
+                    if (tempData.userlist && tempData.userlist.after) {
+                        tempData.userlist.after.forEach(function(file) {
+                            tables[j].addRow(file);
+                        });
+                    }
+
+                } else if (tables[j].id == 'req') {
+
+                    if (newData.masterlist && newData.masterlist.req) {
+                        newData.masterlist.req.forEach(function(file) {
+                            var row = tables[j].addRow(file);
+                            tables[j].setReadOnly(row);
+                        });
+                    }
+                    if (tempData.userlist && tempData.userlist.req) {
+                        tempData.userlist.req.forEach(function(file) {
+                            tables[j].addRow(file);
+                        });
+                    }
+
+                } else if (tables[j].id == 'inc') {
+
+                    if (newData.masterlist && newData.masterlist.inc) {
+                        newData.masterlist.inc.forEach(function(file) {
+                            var row = tables[j].addRow(file);
+                            tables[j].setReadOnly(row);
+                        });
+                    }
+                    if (tempData.userlist && tempData.userlist.inc) {
+                        tempData.userlist.inc.forEach(function(file) {
+                            tables[j].addRow(file);
+                        });
+                    }
+
+                } else if (tables[j].id == 'message') {
+
+                    if (newData.masterlist && newData.masterlist.msg) {
+                        newData.masterlist.msg.forEach(function(message) {
+                            var messageData = {
+                                type: message.type,
+                                content: message.content[0].str,
+                                condition: message.condition,
+                                language: message.content[0].lang
+                            };
+                            var row = tables[j].addRow(messageData);
+                            tables[j].setReadOnly(row);
+
+                        });
+                    }
+                    if (tempData.userlist && tempData.userlist.msg) {
+                        tempData.userlist.msg.forEach(function(message) {
+                            var messageData = {
+                                type: message.type,
+                                content: message.content[0].str,
+                                condition: message.condition,
+                                language: message.content[0].lang
+                            };
+                            tables[j].addRow(messageData);
+                        });
+                    }
+
+                } else if (tables[j].id == 'tags') {
+
+                    if (newData.masterlist && newData.masterlist.tag) {
+                        newData.masterlist.tag.forEach(function(tag) {
+                            var tagData = newData.convTagObj(tag);
+                            var row = tables[j].addRow(tagData);
+                            tables[j].setReadOnly(row);
+                        }, newData);
+                    }
+                    if (tempData.userlist && tempData.userlist.tag) {
+                        tempData.userlist.tag.forEach(function(tag) {
+                            var tagData = tempData.convTagObj(tag);
+                            tables[j].addRow(tagData);
+                        }, tempData);
+                    }
+
+                } else if (tables[j].id == 'dirty') {
+
+                    if (newData.masterlist && newData.masterlist.dirty) {
+                        newData.masterlist.dirty.forEach(function(info) {
+                            info.crc = info.crc.toString(16).toUpperCase();
+                            var row = tables[j].addRow(info);
+                            tables[j].setReadOnly(row);
+                        });
+                    }
+                    if (tempData.userlist && tempData.userlist.dirty) {
+                        tempData.userlist.dirty.forEach(function(info) {
+                            info.crc = info.crc.toString(16).toUpperCase();
+                            tables[j].addRow(info);
+                        });
+                    }
+
+                } else if (tables[j].id == 'locations') {
+
+                    if (newData.masterlist && newData.masterlist.url) {
+                        newData.masterlist.url.forEach(function(location) {
+                            var temp = location;
+                            if (temp.ver) {
+                                temp.ver = temp.ver[0];
+                            }
+                            var row = tables[j].addRow(temp);
+                            tables[j].setReadOnly(row);
+                        });
+                    }
+                    if (tempData.userlist && tempData.userlist.url) {
+                        tempData.userlist.url.forEach(function(location) {
+                            var temp = location;
+                            if (temp.ver) {
+                                temp.ver = temp.ver[0];
+                            }
+                            tables[j].addRow(temp);
+                        });
+                    }
+                }
+            }
+        },
+
+        setTooltipPositions: function() {
+            this.shadowRoot.getElementById('activeTick').setPosition();
+            this.shadowRoot.getElementById('dummyPlugin').setPosition();
+            this.shadowRoot.getElementById('loadsBSA').setPosition();
+            this.shadowRoot.getElementById('globalPriority').parentElement.setPosition();
+        },
+    });
+    </script>
+</polymer-element>
diff --git a/resources/report/html/loot-plugin-item.html b/resources/report/html/loot-plugin-item.html
index 5a0f4258..78f30fc6 100644
--- a/resources/report/html/loot-plugin-item.html
+++ b/resources/report/html/loot-plugin-item.html
@@ -4,96 +4,44 @@
 <link rel="import" href="../bower_components/core-icon/core-icon.html">
 <link rel="import" href="../bower_components/core-icons/core-icons.html">
 
-<polymer-element name="loot-plugin-item" extends="paper-item">
+<polymer-element name="loot-plugin-item" attributes="priorityText">
     <template>
         <style>
-        :host([data-bsa=false]) #loadsBSA,
-        :host([data-dummy=false]) #dummyPlugin,
-        :host([data-edits=false]) #hasUserEdits,
-        :host([data-global-priority=false]) #hasGlobalPriority,
-        :host #hasPriority:not([label^=Priority]) {
+        :host(:not([data-bsa])) #loadsBSA,
+        :host(:not([data-edits])) #hasUserEdits {
             visibility: hidden;
         }
-        :host a {
+        ::content a {
             text-decoration: none;
             color: black;
         }
-        :host .hasGlobalPriority, :host #hasPriority {
-            display:none;
-        }
-        :host-context(body.editMode) #hasGlobalPriority,
-        :host-context(body.editMode) #hasPriority {
-            display: inline-block;
+        core-tooltip {
+            margin: 0.25em;
         }
         div {
-            min-width: 62px;
-        }
-
-        /* The default styling for Polymer's <paper-item>, which seems to be applied in an external stylesheet, so isn't inherited. */
-        :host::shadow paper-ripple {
-            position: absolute;
-            top: 0;
-            bottom: 0;
-            left: 0;
-            right: 0;
-            pointer-events: none;
-        }
-        :host {
-            display: block;
-            position: relative;
-            font-size: 16px;
-            -webkit-user-select: none;
-            cursor: pointer;
-            box-sizing: border-box;
-            height: 48px;
-            padding: 0 16px;
-            white-space: nowrap;
-        }
-        :host::shadow ::content > a {
-            position: absolute;
-            top: 0;
-            bottom: 0;
-            left: 0;
-            right: 0;
+            padding-left: 0.75em;
         }
         </style>
-        <div center horizontal layout>
-            <core-tooltip id="dummyPlugin" label="Dummy Plugin">
-                <core-icon icon="visibility-off"></core-icon>
-            </core-tooltip>
+
+        <paper-item>
             <core-tooltip id="loadsBSA" label="Loads BSA">
                 <core-icon icon="attachment"></core-icon>
             </core-tooltip>
             <core-tooltip id="hasUserEdits" label="Has User Metadata">
                 <core-icon icon="account-circle"></core-icon>
             </core-tooltip>
-            <core-tooltip id="hasGlobalPriority" label="Priority Is Global">
-                <core-icon icon="language"></core-icon>
-            </core-tooltip>
-            <core-tooltip id="hasPriority" label="">
-                <core-icon icon="star"></core-icon>
-            </core-tooltip>
-        </div>
-        <shadow></shadow>
+            <div><content></content></div>
+        </paper-item>
     </template>
     <script>
     Polymer({
-        setLink: function(url) {
-            this.getElementsByTagName('a')[0].href = url;
-        },
-
-        setPriority: function(text) {
-            this.shadowRoot.getElementById('hasPriority').label = text;
+        getName: function() {
+            return this.getElementsByTagName('a')[0].textContent;
         },
 
         handleDragStart: function(evt) {
             evt.dataTransfer.effectAllowed = 'copy';
-            evt.dataTransfer.setData('text/plain', evt.currentTarget.label);
-        },
-
-        created: function() {
-            var a = document.createElement('a');
-            this.appendChild(a);
+            evt.dataTransfer.setData('text/plain', evt.currentTarget.getName());
         },
     });
     </script>
diff --git a/resources/report/html/loot-validated-input.html b/resources/report/html/loot-validated-input.html
new file mode 100644
index 00000000..d53aea53
--- /dev/null
+++ b/resources/report/html/loot-validated-input.html
@@ -0,0 +1,17 @@
+<link rel="import" href="../bower_components/polymer/polymer.html">
+<link rel="import" href="../bower_components/paper-input/paper-input.html">
+<link rel="import" href="../bower_components/paper-input/paper-input-decorator.html">
+<link rel="import" href="../bower_components/core-input/core-input.html">
+
+<polymer-element name="loot-validated-input" attributes="error type required maxlength minlength pattern max min step value disabled">
+    <template>
+        <paper-input-decorator error="{{error}}" isInvalid="{{!$.input.validity.valid}}" disabled?="{{disabled != undefined}}">
+            <input id="input" is="core-input" type="{{type}}" class="{{class}}" required?="{{required != undefined}}" maxlength?="{{maxlength}}" minlength?="{{minlength}}" pattern?="{{pattern}}" max?="{{max}}" min?="{{min}}" step?="{{step}}" value="{{value}}" disabled?="{{disabled != undefined}}">
+        </paper-input-decorator>
+    </template>
+    <script>
+    Polymer({
+        type: 'text',
+    });
+    </script>
+</polymer-element>
\ No newline at end of file
diff --git a/resources/report/js/filters.js b/resources/report/js/filters.js
new file mode 100644
index 00000000..67781288
--- /dev/null
+++ b/resources/report/js/filters.js
@@ -0,0 +1,166 @@
+var filters = {
+    /* Filter functions return true if the given plugin passes the filter and
+       should be displayed, otherwise false. */
+
+    hiddenPluginNo: 0,
+    hiddenMessageNo: 0,
+    conflicts: [],
+
+    searchFilter: function(plugin, needle) {
+        if (needle.length == 0) {
+            return true;
+        }
+
+        if (plugin.name.toLowerCase().indexOf(needle) != -1
+            || plugin.getCrcString().toLowerCase().indexOf(needle) != -1
+            || plugin.version.toLowerCase().indexOf(needle) != -1) {
+
+            return true;
+        }
+
+        var tags = plugin.getTagStrings();
+        if (tags.added.toLowerCase().indexOf(needle) != -1
+            || tags.removed.toLowerCase().indexOf(needle) != -1) {
+
+            return true;
+        }
+
+        for (var i = 0; i < plugin.messages.length; ++i) {
+            if (plugin.messages[i].content[0].str.toLowerCase().indexOf(needle) != -1) {
+                return true;
+            }
+        }
+    },
+
+    messagelessFilter: function(plugin) {
+        /* This function could be further optimised to perform fewer checks,
+           but it's also responsible for setting the hidden message count, so
+           has to go through everything. */
+
+        var hasMessages = false;
+        /* If any messages exist, check if they are hidden or not. Note
+           that the messages may not be present as elements, so the check
+           is actually if they would be hidden according to the message
+           filters. */
+        if (this.allMessageFilter()) {
+            plugin.messages.forEach(function(message){
+                if (this.noteFilter(message)
+                    && this.doNotCleanFilter(message)) {
+
+                    hasMessages = true;
+                    return;
+                }
+                ++hiddenMessageNo;
+            }, this);
+        } else {
+            hiddenMessageNo += plugin.messages.length;
+        }
+
+        if (document.getElementById('hideMessagelessPlugins').checked) {
+            return hasMessages;
+        } else {
+            return true;
+        }
+    },
+
+    inactiveFilter: function(plugin) {
+        if (document.getElementById('hideInactivePlugins').checked) {
+            return plugin.isActive;
+        } else {
+            return true;
+        }
+    },
+
+    conflictsFilter: function(plugin) {
+        if (this.conflicts.length > 0) {
+            return this.conflicts.indexOf(plugin.name) != -1;
+        } else {
+            return true;
+        }
+    },
+
+    applyPluginFilters: function(plugins) {
+        var search = document.getElementById('searchBox').value.toLowerCase();
+        hiddenPluginNo = 0;
+        hiddenMessageNo = 0;
+        var filteredPlugins = [];
+
+        plugins.forEach(function(plugin){
+            /* Messageless filter needs to run first. */
+            if (this.messagelessFilter(plugin)
+                && this.inactiveFilter(plugin)
+                && this.conflictsFilter(plugin)
+                && this.searchFilter(plugin, search)) {
+
+                filteredPlugins.push(plugin);
+                return;
+            }
+            ++hiddenPluginNo;
+        }, this);
+
+        document.getElementById('hiddenPluginNo').textContent = hiddenPluginNo;
+        document.getElementById('hiddenMessageNo').textContent = hiddenMessageNo;
+
+        return filteredPlugins;
+    },
+
+    /* Message filter functions are run from within plugin cards, when the card's
+       messages are to be added as elements. Each filter should return true if the
+       message is to be displayed. */
+
+    noteFilter: function(message) {
+        if (document.getElementById('hideNotes').checked) {
+            return message.type != 'say';
+        } else {
+            return true;
+        }
+    },
+
+    doNotCleanFilter: function(message) {
+        if (document.getElementById('hideDoNotCleanMessages').checked) {
+            return message.content[0].str.indexOf(l10n.jed.translate("Do not clean").fetch()) == -1;
+        } else {
+            return true;
+        }
+    },
+
+    allMessageFilter: function() {
+        return !document.getElementById('hideAllPluginMessages').checked;
+    },
+
+    applyMessageFilters: function(messages) {
+        var filteredMessages = [];
+
+        if (this.allMessageFilter()) {
+            messages.forEach(function(message){
+                if (this.noteFilter(message)
+                    && this.doNotCleanFilter(message)) {
+
+                    filteredMessages.push(message);
+                    return;
+                }
+            }, this);
+        }
+
+        return filteredMessages;
+    },
+};
+
+function setFilteredUIData(evt) {
+    /* The conflict filter, if enabled, executes C++ code, so needs to be
+       handled using a promise, so the rest of the function should wait until
+       it is completed.
+    */
+    getConflictingPluginsFromFilter().then(function(conflicts) {
+        filters.conflicts = conflicts;
+        var filtered = filters.applyPluginFilters(loot.game.plugins);
+        document.getElementById('cardsNav').lastElementChild.data = filtered;
+        document.getElementById('main').lastElementChild.data = filtered;
+
+        /* Also run message filters on the current card elements. */
+        var cards = document.getElementById('main').getElementsByTagName('loot-plugin-card');
+        for (var i = 0; i < cards.length; ++i) {
+            cards[i].onMessagesChange();  // Calls Plugin.getUIMessages(), which calls filters.applyMessageFilters().
+        }
+    });
+}
\ No newline at end of file
diff --git a/resources/report/js/l10n.js b/resources/report/js/l10n.js
index 4399c298..8a58c21b 100644
--- a/resources/report/js/l10n.js
+++ b/resources/report/js/l10n.js
@@ -58,71 +58,80 @@
                 pluginCard = document.querySelector('polymer-element[name="loot-plugin-card"]').querySelector('template').content;
             }
 
-            pluginCard.getElementById('front').querySelector('.activeTick').label = l10n.translate("Active Plugin").fetch();
-            pluginCard.getElementById('editor').querySelector('.activeTick').label = l10n.translate("Active Plugin").fetch();
-            pluginCard.getElementById('front').querySelector('.dummyPlugin').label = l10n.translate("Dummy Plugin").fetch();
-            pluginCard.getElementById('editor').querySelector('.dummyPlugin').label = l10n.translate("Dummy Plugin").fetch();
-            pluginCard.getElementById('front').querySelector('.loadsBSA').label = l10n.translate("Loads BSA").fetch();
-            pluginCard.getElementById('editor').querySelector('.loadsBSA').label = l10n.translate("Loads BSA").fetch();
+            pluginCard.getElementById('activeTick').label = l10n.translate("Active Plugin").fetch();
+            pluginCard.getElementById('dummyPlugin').label = l10n.translate("Dummy Plugin").fetch();
+            pluginCard.getElementById('loadsBSA').label = l10n.translate("Loads BSA").fetch();
             pluginCard.getElementById('hasUserEdits').label = l10n.translate("Has User Metadata").fetch();
 
-            pluginCard.getElementById('enableEdits').label = l10n.translate("Enable Edits").fetch();
-            pluginCard.getElementById('globalPriority').parentElement.label = l10n.translate("Global priorities are compared against all other plugins. Normal priorities are compared against only conflicting plugins.").fetch();
-            pluginCard.getElementById('globalPriority').label = l10n.translate("Global Priority").fetch();
-            pluginCard.getElementById('priorityValue').previousElementSibling.textContent = l10n.translate("Priority Value").fetch();
-
-            pluginCard.getElementById('fileTabs').querySelector('[data-for=loadAfter]').textContent = l10n.translate("Load After").fetch();
-            pluginCard.getElementById('fileTabs').querySelector('[data-for=req]').textContent = l10n.translate("Requirements").fetch();
-            pluginCard.getElementById('fileTabs').querySelector('[data-for=inc]').textContent = l10n.translate("Incompatibilities").fetch();
-            pluginCard.getElementById('miscTabs').querySelector('[data-for=message]').textContent = l10n.translate("Messages").fetch();
-            pluginCard.getElementById('miscTabs').querySelector('[data-for=tags]').textContent = l10n.translate("Bash Tags").fetch();
-            pluginCard.getElementById('miscTabs').querySelector('[data-for=dirty]').textContent = l10n.translate("Dirty Info").fetch();
-            pluginCard.getElementById('miscTabs').querySelector('[data-for=locations]').textContent = l10n.translate("Locations").fetch();
-
-            pluginCard.getElementById('loadAfter').querySelector('th:first-child').textContent = l10n.translate("Filename").fetch();
-            pluginCard.getElementById('loadAfter').querySelector('th:nth-child(2)').textContent = l10n.translate("Display Name").fetch();
-            pluginCard.getElementById('loadAfter').querySelector('th:nth-child(3)').textContent = l10n.translate("Condition").fetch();
-            pluginCard.getElementById('loadAfter').querySelector('td:first-child').textContent = l10n.translate("Add new row...").fetch();
-
-            pluginCard.getElementById('req').querySelector('th:first-child').textContent = l10n.translate("Filename").fetch();
-            pluginCard.getElementById('req').querySelector('th:nth-child(2)').textContent = l10n.translate("Display Name").fetch();
-            pluginCard.getElementById('req').querySelector('th:nth-child(3)').textContent = l10n.translate("Condition").fetch();
-            pluginCard.getElementById('req').querySelector('td:first-child').textContent = l10n.translate("Add new row...").fetch();
-
-            pluginCard.getElementById('inc').querySelector('th:first-child').textContent = l10n.translate("Filename").fetch();
-            pluginCard.getElementById('inc').querySelector('th:nth-child(2)').textContent = l10n.translate("Display Name").fetch();
-            pluginCard.getElementById('inc').querySelector('th:nth-child(3)').textContent = l10n.translate("Condition").fetch();
-            pluginCard.getElementById('inc').querySelector('td:first-child').textContent = l10n.translate("Add new row...").fetch();
-
-            pluginCard.getElementById('message').querySelector('th:first-child').textContent = l10n.translate("Type").fetch();
-            pluginCard.getElementById('message').querySelector('th:nth-child(2)').textContent = l10n.translate("Content").fetch();
-            pluginCard.getElementById('message').querySelector('th:nth-child(3)').textContent = l10n.translate("Condition").fetch();
-            pluginCard.getElementById('message').querySelector('th:nth-child(4)').textContent = l10n.translate("Language").fetch();
-            pluginCard.getElementById('message').querySelector('td:first-child').textContent = l10n.translate("Add new row...").fetch();
-
-            pluginCard.getElementById('tags').querySelector('th:first-child').textContent = l10n.translate("Add/Remove").fetch();
-            pluginCard.getElementById('tags').querySelector('th:nth-child(2)').textContent = l10n.translate("Bash Tag").fetch();
-            pluginCard.getElementById('tags').querySelector('th:nth-child(3)').textContent = l10n.translate("Condition").fetch();
-            pluginCard.getElementById('tags').querySelector('td:first-child').textContent = l10n.translate("Add new row...").fetch();
-
-            pluginCard.getElementById('dirty').querySelector('th:first-child').textContent = l10n.translate("CRC").fetch();
-            pluginCard.getElementById('dirty').querySelector('th:nth-child(2)').textContent = l10n.translate("ITM Count").fetch();
-            pluginCard.getElementById('dirty').querySelector('th:nth-child(3)').textContent = l10n.translate("Deleted References").fetch();
-            pluginCard.getElementById('dirty').querySelector('th:nth-child(4)').textContent = l10n.translate("Deleted Navmeshes").fetch();
-            pluginCard.getElementById('dirty').querySelector('th:nth-child(5)').textContent = l10n.translate("Cleaning Utility").fetch();
-            pluginCard.getElementById('dirty').querySelector('td:first-child').textContent = l10n.translate("Add new row...").fetch();
-
-            pluginCard.getElementById('locations').querySelector('th:first-child').textContent = l10n.translate("URL").fetch();
-            pluginCard.getElementById('locations').querySelector('th:nth-child(2)').textContent = l10n.translate("Version").fetch();
-            pluginCard.getElementById('locations').querySelector('td:first-child').textContent = l10n.translate("Add new row...").fetch();
-
-            pluginCard.getElementById('accept').textContent = l10n.translate("Apply").fetch();
-            pluginCard.getElementById('cancel').textContent = l10n.translate("Cancel").fetch();
-
             pluginCard.getElementById('showOnlyConflicts').label = l10n.translate("Show Only Conflicts").fetch();
-            pluginCard.getElementById('editMetadata').label = l10n.translate("Edit Metadata").fetch();
-            pluginCard.getElementById('copyMetadata').label = l10n.translate("Copy Metadata As Text").fetch();
-            pluginCard.getElementById('clearMetadata').label = l10n.translate("Clear User Metadata").fetch();
+            pluginCard.getElementById('editMetadata').lastChild.textContent = l10n.translate("Edit Metadata").fetch();
+            pluginCard.getElementById('copyMetadata').lastChild.textContent = l10n.translate("Copy Metadata As Text").fetch();
+            pluginCard.getElementById('clearMetadata').lastChild.textContent = l10n.translate("Clear User Metadata").fetch();
+
+            /* Plugin editor template. */
+            var pluginEditor = document.querySelector('link[rel="import"][href$="loot-plugin-card.html"]');
+            if (pluginEditor) {
+                pluginEditor = pluginEditor.import.querySelector('link[rel="import"][href$="loot-plugin-editor.html"]').import.querySelector('template').content;
+            } else {
+                pluginEditor = document.querySelector('polymer-element[name="loot-plugin-editor"]').querySelector('template').content;
+            }
+
+            pluginEditor.getElementById('activeTick').label = l10n.translate("Active Plugin").fetch();
+            pluginEditor.getElementById('dummyPlugin').label = l10n.translate("Dummy Plugin").fetch();
+            pluginEditor.getElementById('loadsBSA').label = l10n.translate("Loads BSA").fetch();
+
+            pluginEditor.getElementById('enableEdits').label = l10n.translate("Enable Edits").fetch();
+            pluginEditor.getElementById('globalPriority').parentElement.label = l10n.translate("Global priorities are compared against all other plugins. Normal priorities are compared against only conflicting plugins.").fetch();
+            pluginEditor.getElementById('globalPriority').label = l10n.translate("Global Priority").fetch();
+            pluginEditor.getElementById('priorityValue').parentElement.previousElementSibling.textContent = l10n.translate("Priority Value").fetch();
+
+            pluginEditor.getElementById('tableTabs').querySelector('[data-for=loadAfter]').textContent = l10n.translate("Load After").fetch();
+            pluginEditor.getElementById('tableTabs').querySelector('[data-for=req]').textContent = l10n.translate("Requirements").fetch();
+            pluginEditor.getElementById('tableTabs').querySelector('[data-for=inc]').textContent = l10n.translate("Incompatibilities").fetch();
+            pluginEditor.getElementById('tableTabs').querySelector('[data-for=message]').textContent = l10n.translate("Messages").fetch();
+            pluginEditor.getElementById('tableTabs').querySelector('[data-for=tags]').textContent = l10n.translate("Bash Tags").fetch();
+            pluginEditor.getElementById('tableTabs').querySelector('[data-for=dirty]').textContent = l10n.translate("Dirty Info").fetch();
+            pluginEditor.getElementById('tableTabs').querySelector('[data-for=locations]').textContent = l10n.translate("Locations").fetch();
+
+            pluginEditor.getElementById('loadAfter').querySelector('th:first-child').textContent = l10n.translate("Filename").fetch();
+            pluginEditor.getElementById('loadAfter').querySelector('th:nth-child(2)').textContent = l10n.translate("Display Name").fetch();
+            pluginEditor.getElementById('loadAfter').querySelector('th:nth-child(3)').textContent = l10n.translate("Condition").fetch();
+            pluginEditor.getElementById('loadAfter').querySelector('td:first-child').textContent = l10n.translate("Add new row...").fetch();
+
+            pluginEditor.getElementById('req').querySelector('th:first-child').textContent = l10n.translate("Filename").fetch();
+            pluginEditor.getElementById('req').querySelector('th:nth-child(2)').textContent = l10n.translate("Display Name").fetch();
+            pluginEditor.getElementById('req').querySelector('th:nth-child(3)').textContent = l10n.translate("Condition").fetch();
+            pluginEditor.getElementById('req').querySelector('td:first-child').textContent = l10n.translate("Add new row...").fetch();
+
+            pluginEditor.getElementById('inc').querySelector('th:first-child').textContent = l10n.translate("Filename").fetch();
+            pluginEditor.getElementById('inc').querySelector('th:nth-child(2)').textContent = l10n.translate("Display Name").fetch();
+            pluginEditor.getElementById('inc').querySelector('th:nth-child(3)').textContent = l10n.translate("Condition").fetch();
+            pluginEditor.getElementById('inc').querySelector('td:first-child').textContent = l10n.translate("Add new row...").fetch();
+
+            pluginEditor.getElementById('message').querySelector('th:first-child').textContent = l10n.translate("Type").fetch();
+            pluginEditor.getElementById('message').querySelector('th:nth-child(2)').textContent = l10n.translate("Content").fetch();
+            pluginEditor.getElementById('message').querySelector('th:nth-child(3)').textContent = l10n.translate("Condition").fetch();
+            pluginEditor.getElementById('message').querySelector('th:nth-child(4)').textContent = l10n.translate("Language").fetch();
+            pluginEditor.getElementById('message').querySelector('td:first-child').textContent = l10n.translate("Add new row...").fetch();
+
+            pluginEditor.getElementById('tags').querySelector('th:first-child').textContent = l10n.translate("Add/Remove").fetch();
+            pluginEditor.getElementById('tags').querySelector('th:nth-child(2)').textContent = l10n.translate("Bash Tag").fetch();
+            pluginEditor.getElementById('tags').querySelector('th:nth-child(3)').textContent = l10n.translate("Condition").fetch();
+            pluginEditor.getElementById('tags').querySelector('td:first-child').textContent = l10n.translate("Add new row...").fetch();
+
+            pluginEditor.getElementById('dirty').querySelector('th:first-child').textContent = l10n.translate("CRC").fetch();
+            pluginEditor.getElementById('dirty').querySelector('th:nth-child(2)').textContent = l10n.translate("ITM Count").fetch();
+            pluginEditor.getElementById('dirty').querySelector('th:nth-child(3)').textContent = l10n.translate("Deleted References").fetch();
+            pluginEditor.getElementById('dirty').querySelector('th:nth-child(4)').textContent = l10n.translate("Deleted Navmeshes").fetch();
+            pluginEditor.getElementById('dirty').querySelector('th:nth-child(5)').textContent = l10n.translate("Cleaning Utility").fetch();
+            pluginEditor.getElementById('dirty').querySelector('td:first-child').textContent = l10n.translate("Add new row...").fetch();
+
+            pluginEditor.getElementById('locations').querySelector('th:first-child').textContent = l10n.translate("URL").fetch();
+            pluginEditor.getElementById('locations').querySelector('th:nth-child(2)').textContent = l10n.translate("Version").fetch();
+            pluginEditor.getElementById('locations').querySelector('td:first-child').textContent = l10n.translate("Add new row...").fetch();
+
+            pluginEditor.getElementById('accept').textContent = l10n.translate("Apply").fetch();
+            pluginEditor.getElementById('cancel').textContent = l10n.translate("Cancel").fetch();
 
             /* Plugin List Item Template */
             var pluginItem = document.querySelector('link[rel="import"][href$="loot-plugin-item.html"]');
@@ -131,10 +140,8 @@
             } else {
                 pluginItem = document.querySelector('polymer-element[name="loot-plugin-item"]').querySelector('template').content;
             }
-            pluginItem.querySelector('#dummyPlugin').label = l10n.translate("Dummy Plugin").fetch();
-            pluginItem.querySelector('#loadsBSA').label = l10n.translate("Loads BSA").fetch();
-            pluginItem.querySelector('#hasUserEdits').label = l10n.translate("Has User Metadata").fetch();
-            pluginItem.querySelector('#hasGlobalPriority').label = l10n.translate("Priority Is Global").fetch();
+            pluginItem.getElementById('loadsBSA').label = l10n.translate("Loads BSA").fetch();
+            pluginItem.getElementById('hasUserEdits').label = l10n.translate("Has User Metadata").fetch();
 
             /* Message row template */
             var messageRow = document.querySelector('link[rel="import"][href$="editable-table.html"]');
@@ -158,20 +165,20 @@
             tagRow.querySelector('.type').children[1].textContent = l10n.translate("Remove").fetch();
 
             /* Toolbar menu */
-            document.getElementById('redatePluginsButton').label = l10n.translate("Redate Plugins").fetch();
-            document.getElementById('openLogButton').label = l10n.translate("Open Debug Log Location").fetch();
-            document.getElementById('wipeUserlistButton').label = l10n.translate("Clear All User Metadata").fetch();
-            document.getElementById('copyContentButton').label = l10n.translate("Copy Content As Text").fetch();
-            document.getElementById('refreshContentButton').label = l10n.translate("Refresh Content").fetch();
-            document.getElementById('helpButton').label = l10n.translate("View Documentation").fetch();
-            document.getElementById('aboutButton').label = l10n.translate("About").fetch();
-            document.getElementById('settingsButton').label = l10n.translate("Settings").fetch();
+            document.getElementById('redatePluginsButton').lastChild.textContent = l10n.translate("Redate Plugins").fetch();
+            document.getElementById('openLogButton').lastChild.textContent = l10n.translate("Open Debug Log Location").fetch();
+            document.getElementById('wipeUserlistButton').lastChild.textContent = l10n.translate("Clear All User Metadata").fetch();
+            document.getElementById('copyContentButton').lastChild.textContent = l10n.translate("Copy Content As Text").fetch();
+            document.getElementById('refreshContentButton').lastChild.textContent = l10n.translate("Refresh Content").fetch();
+            document.getElementById('helpButton').lastChild.textContent = l10n.translate("View Documentation").fetch();
+            document.getElementById('aboutButton').lastChild.textContent = l10n.translate("About").fetch();
+            document.getElementById('settingsButton').lastChild.textContent = l10n.translate("Settings").fetch();
             document.getElementById('applySortButton').textContent = l10n.translate("Apply").fetch();
             document.getElementById('cancelSortButton').textContent = l10n.translate("Cancel").fetch();
 
             /* Nav items */
-            document.getElementById('container').querySelector('div[drawer] > core-menu > paper-item[label=Summary]').label = l10n.translate("Summary").fetch();
-            document.getElementById('container').querySelector('div[drawer] > core-menu > paper-item[label^=General]').label = l10n.translate("General Messages").fetch();
+            document.getElementById('cardsNav').firstElementChild.lastChild.textContent = l10n.translate("Summary").fetch();
+            document.getElementById('cardsNav').firstElementChild.nextElementSibling.lastChild.textContent = l10n.translate("General Messages").fetch();
             document.getElementById('sidebarTabs').firstElementChild.textContent = l10n.translate("Plugins").fetch();
             document.getElementById('sidebarTabs').firstElementChild.nextElementSibling.textContent = l10n.translate("Filters").fetch();
             document.getElementById('searchBox').parentElement.label = l10n.translate("Press Enter when searching to select the next match.").fetch();
@@ -206,7 +213,7 @@
             document.getElementById('settingsDialog').heading = l10n.translate("Settings").fetch();
 
             document.getElementById('defaultGameSelect').previousElementSibling.textContent = l10n.translate("Default Game").fetch();
-            document.getElementById('defaultGameSelect').children[0].label = l10n.translate("Autodetect").fetch();
+            document.getElementById('defaultGameSelect').firstElementChild.textContent = l10n.translate("Autodetect").fetch();
 
             document.getElementById('languageSelect').previousElementSibling.textContent = l10n.translate("Language").fetch();
 
diff --git a/resources/report/js/plugin.js b/resources/report/js/plugin.js
index afc69798..b484351a 100644
--- a/resources/report/js/plugin.js
+++ b/resources/report/js/plugin.js
@@ -41,6 +41,9 @@ function Plugin(obj) {
     this.isDirty = obj.isDirty;
 
     this.id = this.name.replace(/\s+/g, '');
+    this.isMenuOpen = false;
+    this.isEditorOpen = false;
+    this.isConflictFilterChecked = false;
 
     /* Converts between the LOOT metadata object for tags, and their
        editor row representation. */
@@ -63,7 +66,7 @@ function Plugin(obj) {
         return tag;
     }
 
-    Plugin.prototype.updateCardTags = function() {
+    Plugin.prototype.getTagStrings = function() {
         var tagsAdded = [];
         var tagsRemoved = [];
 
@@ -88,107 +91,50 @@ function Plugin(obj) {
             }
         }
 
-        if (tagsAdded.length != 0) {
-            this.card.getElementsByClassName('tag add')[0].textContent = tagsAdded.join(', ');
-            this.card.getElementsByClassName('tag add')[0].classList.toggle('hidden', false);
-        } else {
-            this.card.getElementsByClassName('tag add')[0].classList.toggle('hidden', true);
-        }
-        if (tagsRemoved.length != 0) {
-            this.card.getElementsByClassName('tag remove')[0].textContent = tagsRemoved.join(', ');
-            this.card.getElementsByClassName('tag remove')[0].classList.toggle('hidden', false);
-        } else {
-            this.card.getElementsByClassName('tag remove')[0].classList.toggle('hidden', true);
-        }
+        return {
+            added: tagsAdded.join(', '),
+            removed: tagsRemoved.join(', ')
+        };
     }
 
     Plugin.prototype.getPriorityString = function() {
         if (this.modPriority != 0) {
-            return 'Priority: ' + this.modPriority;
+            return this.modPriority.toString();
         } else {
             return '';
         }
     }
 
-    Plugin.prototype.updateCardMessages = function() {
-        var messageUL = this.card.getElementsByTagName('ul')[0];
-        /* First clear any existing messages. */
-        while(messageUL.firstElementChild) {
-            messageUL.removeChild(messageUL.firstElementChild);
+    Plugin.prototype.getCrcString = function() {
+        if (this.crc == 0) {
+            return '';
+        } else {
+            return this.crc.toString(16).toUpperCase();
         }
+    }
+
+    Plugin.prototype.getUIMessages = function() {
+        var uiMessages = [];
         /* Now add the new messages. */
         if (this.messages && this.messages.length != 0) {
-            this.messages.forEach(function(message) {
+            var messages = filters.applyMessageFilters(this.messages);
+            messages.forEach(function(message) {
                 var messageLi = document.createElement('li');
                 messageLi.className = message.type;
                 // Use the Marked library for Markdown formatting support.
                 messageLi.innerHTML = marked(message.content[0].str);
-                messageUL.appendChild(messageLi);
+                uiMessages.push(messageLi);
 
             });
-            this.card.getElementsByTagName('ul')[0].classList.toggle('hidden', false);
-        } else {
-            this.card.getElementsByTagName('ul')[0].classList.toggle('hidden', true);
-        }
-    }
-
-    Plugin.prototype.createCard = function() {
-        var card = document.createElement('loot-plugin-card');
-        this.card = card;
-
-        card.id = this.id;
-
-        card.setAttribute('data-active', this.isActive);
-        card.setAttribute('data-dummy', this.isDummy);
-        card.setAttribute('data-bsa', this.loadsBSA);
-        card.setAttribute('data-edits', this.userlist != undefined);
-
-        /* Fill in name, version, CRC. */
-        card.getElementsByTagName('h1')[0].textContent = this.name;
-        card.getElementsByClassName('version')[0].textContent = this.version;
-        if (this.crc != 0) {
-            card.getElementsByClassName('crc')[0].textContent = this.crc.toString(16).toUpperCase();
         }
 
-        /* Fill in Bash Tag suggestions. */
-        this.updateCardTags();
-
-        /* Fill in messages. */
-        this.updateCardMessages();
-
-        document.getElementById('main').appendChild(card);
-    }
-
-    Plugin.prototype.createListItem = function() {
-        var li = document.createElement('loot-plugin-item');
-        this.li = li;
-
-        li.label = this.name;
-        li.setLink('#' + this.id);
-        li.setPriority(this.getPriorityString());
-
-        li.setAttribute('data-dummy', this.isDummy);
-        li.setAttribute('data-bsa', this.loadsBSA);
-        li.setAttribute('data-edits', this.userlist != undefined);
-        li.setAttribute('data-global-priority', this.isGlobalPriority);
-
-        document.getElementById('cardsNav').appendChild(li);
+        return uiMessages;
     }
 
     Plugin.prototype.observer = function(changes) {
         changes.forEach(function(change) {
-            if (change.name == 'userlist') {
-                change.object.li.setAttribute('data-edits', change.object[change.name] != undefined);
-                change.object.card.setAttribute('data-edits', change.object[change.name] != undefined);
-            } else if (change.name == 'modPriority') {
-                change.object.li.setPriority(this.getPriorityString());
-                change.object.card.shadowRoot.getElementById('priorityValue').value = change.object[change.name];
-            } else if (change.name == 'isGlobalPriority') {
-                change.object.li.setAttribute('data-global-priority', change.object[change.name]);
-            } else if (change.name == 'messages') {
-                change.object.updateCardMessages();
-                /* For messages, the card's messages need updating,
-                   as do the message counts. */
+            if (change.name == 'messages') {
+                /* Update the message counts. */
                 var oldTotal = 0;
                 var newTotal = 0;
                 var oldWarns = 0;
@@ -223,27 +169,17 @@ function Plugin(obj) {
                 document.getElementById('totalMessageNo').textContent = parseInt(document.getElementById('totalMessageNo').textContent, 10) + newTotal - oldTotal;
                 document.getElementById('totalWarningNo').textContent = parseInt(document.getElementById('totalWarningNo').textContent, 10) + newWarns - oldWarns;
                 document.getElementById('totalErrorNo').textContent = parseInt(document.getElementById('totalErrorNo').textContent, 10) + newErrs - oldErrs;
-            } else if (change.name == 'tags') {
-                change.object.updateCardTags();
             } else if (change.name == 'isDirty') {
+                /* Update dirty counts. */
                 if (change.object[change.name]) {
                     document.getElementById('dirtyPluginNo').textContent = ++parseInt(document.getElementById('dirtyPluginNo').textContent, 10);
                 } else {
                     document.getElementById('dirtyPluginNo').textContent = --parseInt(document.getElementById('dirtyPluginNo').textContent, 10);
                 }
-            } else if (change.name == 'crc') {
-                if (change.object[change.name] != 0) {
-                    change.object.card.getElementsByClassName('crc')[0].textContent = change.object[change.name].toString(16).toUpperCase();
-                }
-            } else if (change.name == 'isDummy') {
-                change.object.li.setAttribute('data-dummy', change.object[change.name]);
-                change.object.card.setAttribute('data-dummy', change.object[change.name]);
             }
         });
     }
 
-    this.createCard();
-    this.createListItem();
     Object.observe(this, this.observer);
 }
 
diff --git a/resources/report/js/script.js b/resources/report/js/script.js
index 5708f50f..95959d43 100644
--- a/resources/report/js/script.js
+++ b/resources/report/js/script.js
@@ -174,7 +174,7 @@ var loot = {
         this.settings.games.forEach(function(game){
             var menuItem = document.createElement('paper-item');
             menuItem.setAttribute('value', game.folder);
-            menuItem.setAttribute('label', game.name);
+            menuItem.textContent = game.name;
             gameMenu.appendChild(menuItem);
             gameSelect.appendChild(menuItem.cloneNode());
 
@@ -352,41 +352,6 @@ function processCefError(err) {
     showMessageBox('Error', err.message);
 }
 
-function saveFilterState(evt) {
-    if (evt.currentTarget.checked) {
-        if (!loot.settings.filters) {
-            loot.settings.filters = {};
-        }
-        loot.settings.filters[evt.currentTarget.id] = true;
-    } else {
-        if (loot.settings.filters) {
-            delete loot.settings.filters[evt.currentTarget.id];
-        }
-    }
-
-    var request = JSON.stringify({
-        name: 'saveFilterState',
-        args: [
-            evt.currentTarget.id,
-            evt.currentTarget.checked
-        ]
-    });
-
-    loot.query(request).catch(processCefError);
-}
-function applySavedFilters() {
-    if (loot.settings.filters) {
-        for (var key in loot.settings.filters) {
-            var elem = document.getElementById(key);
-            if (elem) {
-                elem.dispatchEvent(new MouseEvent('click'));
-            }
-        }
-    }
-}
-function isVisible(element) {
-    return (element.className.indexOf('hidden') == -1);
-}
 function showElement(element) {
     if (element != null) {
         element.classList.toggle('hidden', false);
@@ -409,7 +374,11 @@ function toggleDisplayCSS(evt) {
         }
     }
 }
-
+function toast(text) {
+    var toast = document.getElementById('toast');
+    toast.text = text;
+    toast.show();
+}
 function getConflictingPluginsFromFilter() {
     var conflictsPlugin = document.body.getAttribute('data-conflicts');
     if (conflictsPlugin) {
@@ -454,70 +423,6 @@ function getConflictingPluginsFromFilter() {
 
     return Promise.resolve([]);
 }
-function applyFilters(evt) {
-    var cards = document.getElementById('main').getElementsByTagName('loot-plugin-card');
-    var entries = document.getElementById('cardsNav').getElementsByTagName('loot-plugin-item');
-    var hiddenPluginNo = 0;
-    var hiddenMessageNo = 0;
-    if (cards.length != entries.length) {
-        throw Error("Error: Number of plugins in sidebar doesn't match number of plugins in main area!");
-    }
-    /* The conflict filter, if enabled, executes C++ code, so needs to be
-       handled using a promise, so the rest of the function should wait until
-       it is completed.
-    */
-    getConflictingPluginsFromFilter().then(function(conflicts) {
-        for (var i = 0; i < cards.length; ++i) {
-            var isConflictingPlugin = false;
-            var isMessageless = true;
-            var hasInactivePluginMessages = false;
-            var messages = cards[i].getElementsByTagName('ul')[0].getElementsByTagName('li');
-            if (cards[i].getAttribute('data-active') == 'false') {
-                hasInactivePluginMessages = true;
-            }
-            if (conflicts.indexOf(cards[i].getName()) != -1) {
-                isConflictingPlugin = true;
-            }
-            for (var j = 0; j < messages.length; ++j) {
-                var hasPluginMessages = false;
-                var hasNotes = false;
-                var hasDoNotCleanMessages = false;
-                if (messages[j].parentElement.parentElement.id != 'generalMessages') {
-                    hasPluginMessages = true;
-                }
-                if (messages[j].className.indexOf('say') != -1) {
-                    hasNotes = true;
-                }
-                if (messages[j].textContent.indexOf(l10n.jed.translate("Do not clean.").fetch()) != -1) {
-                    hasDoNotCleanMessages = true;
-                }
-                if ((document.getElementById('hideAllPluginMessages').checked && hasPluginMessages)
-                    || (document.getElementById('hideNotes').checked && hasNotes)
-                    || (document.getElementById('hideDoNotCleanMessages').checked && hasDoNotCleanMessages)
-                    || (document.getElementById('hideInactivePluginMessages').checked && hasInactivePluginMessages)) {
-                    hideElement(messages[j]);
-                    ++hiddenMessageNo;
-                } else {
-                    showElement(messages[j]);
-                }
-                if (messages[j].className.indexOf('hidden') == -1) {
-                    isMessageless = false;
-                }
-            }
-            if ((document.getElementById('hideMessagelessPlugins').checked && isMessageless)
-                || conflicts.length > 0 && !isConflictingPlugin) {
-                hideElement(cards[i]);
-                hideElement(entries[i]);
-                ++hiddenPluginNo;
-            } else {
-                showElement(cards[i]);
-                showElement(entries[i]);
-            }
-        }
-        document.getElementById('hiddenMessageNo').textContent = hiddenMessageNo;
-        document.getElementById('hiddenPluginNo').textContent = hiddenPluginNo;
-    });
-}
 function showMessageDialog(title, text, yesNo, closeCallback) {
     var dialog = document.createElement('loot-message-dialog');
     if (yesNo) {
@@ -560,12 +465,6 @@ function changeGame(evt) {
 
         /* Clear the UI of all existing game-specific data. Also
            clear the card and li variables for each plugin object. */
-        loot.game.plugins.forEach(function(plugin){
-            plugin.card.parentElement.removeChild(plugin.card);
-            plugin.card = undefined;
-            plugin.li.parentElement.removeChild(plugin.li);
-            plugin.li = undefined;
-        });
         var globalMessages = document.getElementById('generalMessages').getElementsByTagName('ul')[0];
         while (globalMessages.firstElementChild) {
             globalMessages.removeChild(globalMessages.firstElementChild);
@@ -578,14 +477,22 @@ function changeGame(evt) {
             loot.game.masterlist = gameInfo.masterlist;
             loot.game.globalMessages = gameInfo.globalMessages;
             loot.game.plugins = gameInfo.plugins;
+
+            /* Reset virtual list positions. */
+            document.getElementById('cardsNav').lastElementChild.scrollToItem(0);
+            document.getElementById('main').lastElementChild.scrollToItem(0);
+
+            /* Now update virtual lists. */
+            setFilteredUIData();
+
+            /* Update the list sizes to take into account data changes. */
+            document.getElementById('cardsNav').lastElementChild.updateSize();
+            document.getElementById('main').lastElementChild.updateSize();
         } catch (e) {
             console.log(e);
             console.log('changeGame response: ' + result);
         }
 
-        /* Reapply previously active filters. */
-        applyFilters();
-
         closeProgressDialog();
     }).catch(processCefError);
 }
@@ -613,6 +520,10 @@ function updateMasterlistNoProgress() {
                     }
                 }
             });
+
+            toast('Masterlist updated to revision ' + loot.game.masterlist.revision + '.');
+        } else {
+            toast('No masterlist update was necessary.');
         }
     }).catch(processCefError);
 }
@@ -656,7 +567,7 @@ function sortUIElements(pluginNames) {
             /* Also need to move plugin sidebar entry. */
             var li;
             for (var i = 0; i < entries.length; ++i) {
-                if (entries[i].label == name) {
+                if (entries[i].getName() == name) {
                     li = entries[i];
                 }
             }
@@ -684,18 +595,16 @@ function sortUIElements(pluginNames) {
 function showProgress(message) {
     var progressDialog = document.getElementById('progressDialog');
     if (message) {
-        progressDialog.getElementsByTagName('h1')[0].textContent = message;
+        progressDialog.getElementsByTagName('p')[0].textContent = message;
     }
-    if (!progressDialog.open) {
+    if (!progressDialog.opened) {
         progressDialog.showModal();
-        progressDialog.querySelector('.progress').classList.toggle('running');
     }
 }
 function closeProgressDialog() {
     var progressDialog = document.getElementById('progressDialog');
-    if (progressDialog.open) {
+    if (progressDialog.opened) {
         progressDialog.close();
-        progressDialog.querySelector('.progress').classList.toggle('running');
     }
 }
 function sortPlugins(evt) {
@@ -810,7 +719,7 @@ function redatePlugins(evt) {
     showMessageDialog('Redate Plugins', 'This feature is provided so that modders using the Creation Kit may set the load order it uses. A side-effect is that any subscribed Steam Workshop mods will be re-downloaded by Steam. Do you wish to continue?', false, function(result){
         if (result) {
             loot.query('redatePlugins').then(function(response){
-                showMessageBox('Redate Plugins', 'Plugins were successfully redated.');
+                toast('Plugins were successfully redated.');
             }).catch(processCefError);
         }
     });
@@ -836,6 +745,8 @@ function clearAllMetadata(evt) {
                             }
                         }
                     });
+
+                    toast.text('All user-added metadata has been cleared.');
                 }
             }).catch(processCefError);
         }
@@ -891,7 +802,9 @@ function copyContent(evt) {
         }]
     });
 
-    loot.query(request).catch(processCefError);
+    loot.query(request).then(function(){
+        toast("LOOT's content has been copied to the clipboard.");
+    }).catch(processCefError);
 }
 function areSettingsValid() {
     /* Validate inputs individually. */
@@ -904,26 +817,11 @@ function areSettingsValid() {
     }
     return true;
 }
-function openMenu(evt) {
-    if (!isVisible(evt.currentTarget.firstElementChild)) {
-        showElement(evt.currentTarget.firstElementChild)
-
-        /* To prevent the click event closing this menu just after it was
-           opened, stop the current event and send off a new one. */
-        evt.stopPropagation();
-
-        document.body.dispatchEvent(new CustomEvent('click', {
-            bubbles: true,
-            detail: {
-                newMenu: evt.currentTarget.firstElementChild
-            }
-        }));
-    }
-}
 function switchSidebarTab(evt) {
-    var isFirstSelected = evt.target.selected == 0;
-    evt.target.nextElementSibling.classList.toggle('hidden', !isFirstSelected);
-    evt.target.nextElementSibling.nextElementSibling.classList.toggle('hidden', isFirstSelected);
+    evt.target.nextElementSibling.selected = evt.target.selected;
+    if (evt.target.selected == 0) {
+        document.getElementById('cardsNav').lastElementChild.updateSize();
+    }
 }
 
 function showAboutDialog(evt) {
@@ -983,36 +881,6 @@ function closeSettingsDialog(evt) {
 function showSettingsDialog(evt) {
     document.getElementById('settingsDialog').showModal();
 }
-
-function startSearch(evt) {
-    var findNext = false;
-    if (evt.type == 'keyup') {
-        if (evt.keyCode != 13) {
-            // Don't do anything for keyboard events that aren't enter - if valid, the input event will handle them.
-            return;
-        } else {
-            findNext = true;
-        }
-    }
-    if (evt.target.inputValue == '') {
-        loot.query('cancelFind').then(function(result){
-            evt.target.focus();
-        }).catch(processCefError);
-    } else {
-        var request = JSON.stringify({
-            name: 'find',
-            args: [
-                evt.target.inputValue,
-                findNext
-            ]
-        });
-
-        loot.query(request).then(function(result){
-            evt.target.focus();
-        }).catch(processCefError);
-    }
-
-}
 function focusSearch(evt) {
     if (evt.ctrlKey && evt.keyCode == 70) { //'f'
         document.getElementById('searchBox').focus();
@@ -1039,6 +907,9 @@ function handleEditorOpen(evt) {
         elements[i].addEventListener('dragstart', elements[i].handleDragStart, false);
     }
 
+    /* Now show editor. */
+    evt.target.classList.toggle('flip');
+
     /* Enable priority hover in plugins list and enable header
        buttons if this is the only editor instance. */
     var numEditors = 0;
@@ -1048,7 +919,14 @@ function handleEditorOpen(evt) {
     ++numEditors;
 
     if (numEditors == 1) {
-        document.body.classList.add('editMode');
+        /* Disable the toolbar elements. */
+        document.getElementById('wipeUserlistButton').setAttribute('disabled', '');
+        document.getElementById('copyContentButton').setAttribute('disabled', '');
+        document.getElementById('refreshContentButton').setAttribute('disabled', '');
+        document.getElementById('settingsButton').setAttribute('disabled', '');
+        document.getElementById('gameMenu').setAttribute('disabled', '');
+        document.getElementById('updateMasterlistButton').setAttribute('disabled', '');
+        document.getElementById('sortButton').setAttribute('disabled', '');
     }
     document.body.setAttribute('data-editors', numEditors);
 }
@@ -1059,32 +937,31 @@ function handleEditorClose(evt) {
            changed, and update any UI elements necessary. Offload the
            majority of the work to the C++ side of things. */
 
-        /* Find the plugin object. */
-        var index;
-        for (var i = 0; i < loot.game.plugins.length; ++i) {
-            if (loot.game.plugins[i].id == evt.target.id) {
-                index = i;
-                break;
-            }
-        }
+        var edits = evt.target.readFromEditor(evt.target.data);
 
         var request = JSON.stringify({
             name: 'editorClosed',
             args: [
-                evt.target.readFromEditor(loot.game.plugins[index])
+                edits
             ]
         });
         loot.query(request).then(JSON.parse).then(function(result){
             if (result) {
-                loot.game.plugins[index].modPriority = result.modPriority;
-                loot.game.plugins[index].isGlobalPriority = result.isGlobalPriority;
-                loot.game.plugins[index].messages = result.messages;
-                loot.game.plugins[index].tags = result.tags;
-                loot.game.plugins[index].isDirty = result.isDirty;
+                evt.target.data.modPriority = result.modPriority;
+                evt.target.data.isGlobalPriority = result.isGlobalPriority;
+                evt.target.data.messages = result.messages;
+                evt.target.data.tags = result.tags;
+                evt.target.data.isDirty = result.isDirty;
+
+                evt.target.data.userlist = edits.userlist;
+                delete evt.target.data.editor;
             }
         }).catch(processCefError);
     }
 
+    /* Now hide editor. */
+    evt.target.classList.toggle('flip');
+
     /* Remove drag 'n' drop event handlers. */
     var elements = document.getElementById('cardsNav').getElementsByTagName('loot-plugin-item');
     for (var i = 0; i < elements.length; ++i) {
@@ -1098,7 +975,14 @@ function handleEditorClose(evt) {
     --numEditors;
 
     if (numEditors == 0) {
-        document.body.classList.remove('editMode');
+        /* Re-enable toolbar elements. */
+        document.getElementById('wipeUserlistButton').removeAttribute('disabled');
+        document.getElementById('copyContentButton').removeAttribute('disabled');
+        document.getElementById('refreshContentButton').removeAttribute('disabled');
+        document.getElementById('settingsButton').removeAttribute('disabled');
+        document.getElementById('gameMenu').removeAttribute('disabled');
+        document.getElementById('updateMasterlistButton').removeAttribute('disabled');
+        document.getElementById('sortButton').removeAttribute('disabled');
     }
     document.body.setAttribute('data-editors', numEditors);
 }
@@ -1109,7 +993,9 @@ function handleConflictsFilter(evt) {
         var cards = document.getElementById('main').getElementsByTagName('loot-plugin-card');
         for (var i = 0; i < cards.length; ++i) {
             cards[i].classList.toggle('highlight', false);
-            cards[i].deactivateConflictFilter();
+            if (cards[i] != evt.target) {
+                cards[i].deactivateConflictFilter();
+            }
         }
         evt.target.classList.toggle('highlight', true);
         document.body.setAttribute('data-conflicts', evt.target.getName());
@@ -1117,7 +1003,7 @@ function handleConflictsFilter(evt) {
         evt.target.classList.toggle('highlight', false);
         document.body.removeAttribute('data-conflicts');
     }
-    applyFilters(evt);
+    setFilteredUIData(evt);
 }
 function handleCopyMetadata(evt) {
     /* evt.detail is the name of the plugin. */
@@ -1128,7 +1014,9 @@ function handleCopyMetadata(evt) {
         ]
     });
 
-    loot.query(request).catch(processCefError);
+    loot.query(request).then(function(){
+        toast('The metadata for ' + evt.target.getName() + ' has been copied to the clipboard.');
+    }).catch(processCefError);
 }
 function handleClearMetadata(evt) {
     showMessageDialog('Clear Plugin Metadata', 'Are you sure you want to clear all existing user-added metadata from "' + evt.target.getName() + '"?', false, function(result){
@@ -1153,36 +1041,42 @@ function handleClearMetadata(evt) {
                             loot.game.plugins[i].tags = result.tags;
                             loot.game.plugins[i].isDirty = result.isDirty;
 
-                            /* Also update the card content. */
-                            loot.game.plugins[i].card.setEditorData(loot.game.plugins[i]);
-
                             break;
                         }
                     }
+                    toast('The user-added metadata for ' + evt.target.getName() + ' has been cleared.');
                 }
             }).catch(processCefError);
         }
     });
 }
-function setupEventHandlers() {
-    var elements;
-    /*Set up filter value and CSS setting storage read/write handlers.*/
-    elements = document.getElementById('filters').getElementsByTagName('input');
-    for (var i = 0; i < elements.length; ++i) {
-        elements[i].addEventListener('click', saveFilterState, false);
+function toggleDrawer(evt) {
+    document.getElementById('container').togglePanel();
+}
+function handleSidebarClick(evt) {
+    if (evt.target.hasAttribute('data-index')) {
+        window.location.hash = '';
+        document.getElementById('main').querySelector('core-list').scrollToItem(evt.target.getAttribute('data-index'));
+        /* However, the scroll bar that the plugin card list uses is for the whole main content area, so the position is offset by the heights of the summary and general messages cards. Adjust to compensate. */
+        document.getElementById('main').scrollTop += document.getElementById('main').querySelector('core-list').offsetTop;
     }
-
+}
+function setupEventHandlers() {
     /*Set up handlers for filters.*/
     document.getElementById('hideVersionNumbers').addEventListener('change', toggleDisplayCSS, false);
     document.getElementById('hideCRCs').addEventListener('change', toggleDisplayCSS, false);
     document.getElementById('hideBashTags').addEventListener('change', toggleDisplayCSS, false);
-    document.getElementById('hideNotes').addEventListener('change', applyFilters, false);
-    document.getElementById('hideDoNotCleanMessages').addEventListener('change', applyFilters, false);
-    document.getElementById('hideInactivePluginMessages').addEventListener('change', applyFilters, false);
-    document.getElementById('hideAllPluginMessages').addEventListener('change', applyFilters, false);
-    document.getElementById('hideMessagelessPlugins').addEventListener('change', applyFilters, false);
+    document.getElementById('hideNotes').addEventListener('change', setFilteredUIData, false);
+    document.getElementById('hideDoNotCleanMessages').addEventListener('change', setFilteredUIData, false);
+    document.getElementById('hideInactivePlugins').addEventListener('change', setFilteredUIData, false);
+    document.getElementById('hideAllPluginMessages').addEventListener('change', setFilteredUIData, false);
+    document.getElementById('hideMessagelessPlugins').addEventListener('change', setFilteredUIData, false);
     document.body.addEventListener('loot-filter-conflicts', handleConflictsFilter, false);
 
+    /* Set up event handlers for content filter. */
+    document.getElementById('searchBox').addEventListener('change', setFilteredUIData, false);
+    window.addEventListener('keyup', focusSearch, false);
+
     /* Set up handlers for buttons. */
     document.getElementById('redatePluginsButton').addEventListener('click', redatePlugins, false);
     document.getElementById('openLogButton').addEventListener('click', openLogLocation, false);
@@ -1203,17 +1097,14 @@ function setupEventHandlers() {
     settings.getElementsByClassName('accept')[0].addEventListener('click', closeSettingsDialog, false);
     settings.getElementsByClassName('cancel')[0].addEventListener('click', closeSettingsDialog, false);
 
-    /* Set up event handlers for content search. */
-    var searchBox = document.getElementById('searchBox');
-    searchBox.addEventListener('input', startSearch, false);
-    searchBox.addEventListener('keyup', startSearch, false);
-    window.addEventListener('keyup', focusSearch, false);
-
     /* Set up handler for opening and closing editors. */
     document.body.addEventListener('loot-editor-open', handleEditorOpen, false);
     document.body.addEventListener('loot-editor-close', handleEditorClose, false);
     document.body.addEventListener('loot-copy-metadata', handleCopyMetadata, false);
     document.body.addEventListener('loot-clear-metadata', handleClearMetadata, false);
+
+    document.getElementById('drawerToggle').addEventListener('click', toggleDrawer, false);
+    document.getElementById('cardsNav').addEventListener('click', handleSidebarClick, false);
 }
 function initVars() {
     loot.query('getVersion').then(function(result){
@@ -1253,7 +1144,7 @@ function initVars() {
             for (var i = 0; i < loot.languages.length; ++i) {
                 var settingsItem = document.createElement('paper-item');
                 settingsItem.setAttribute('value', loot.languages[i].locale);
-                settingsItem.setAttribute('label', loot.languages[i].name);
+                settingsItem.textContent = loot.languages[i].name;
                 settingsLangSelect.appendChild(settingsItem);
 
                 var option = document.createElement('option');
@@ -1302,9 +1193,9 @@ function initVars() {
             /* Fill in game row template's game type options. */
             var select = document.querySelector('link[rel="import"][href$="editable-table.html"]');
             if (select) {
-                select = select.import.querySelector('#gameRow').content.querySelector('select')
+                select = select.import.querySelector('#gameRow').content.querySelector('.type')
             } else {
-                select = document.querySelector('#gameRow').content.querySelector('select');
+                select = document.querySelector('#gameRow').content.querySelector('.type');
             }
             for (var j = 0; j < loot.gameTypes.length; ++j) {
                 var option = document.createElement('option');
@@ -1331,36 +1222,39 @@ function initVars() {
                 console.log('getSettings response: ' + results[2]);
             }
 
-            if (!result) {
-                loot.query('getGameData').then(function(result){
-                    try {
-                        var game = JSON.parse(result, jsonToPlugin);
-                        loot.game.folder = game.folder;
-                        loot.game.masterlist = game.masterlist;
-                        loot.game.globalMessages = game.globalMessages;
-                        loot.game.plugins = game.plugins;
-                    } catch (e) {
-                        console.log(e);
-                        console.log('getGameData response: ' + result);
-                    }
-
-                    applySavedFilters();
+            var promise;
+            if (result) {
+                promise = new Promise(function(resolve, reject){
                     closeProgressDialog();
-                }).catch(processCefError);
+                    document.getElementById('settingsButton').click();
+                    resolve('');
+                });
             } else {
-                document.getElementById('settingsButton').click();
-                closeProgressDialog();
+                promise = loot.query('getGameData').then(function(result){
+                    var game = JSON.parse(result, jsonToPlugin);
+                    loot.game.folder = game.folder;
+                    loot.game.masterlist = game.masterlist;
+                    loot.game.globalMessages = game.globalMessages;
+                    loot.game.plugins = game.plugins;
+                    document.getElementById('cardsNav').lastElementChild.data = loot.game.plugins;
+                    document.getElementById('main').lastElementChild.data = loot.game.plugins;
+
+                    closeProgressDialog();
+                    return '';
+                }).catch(processCefError);
             }
 
-            /* So much easier than trying to set up my own C++ message loop to listen
-               to window messages looking for a focus change. */
-            if (loot.settings.autoRefresh) {
-                window.addEventListener('focus', onFocus, false);
-            }
+            promise.then(function(){
+                /* So much easier than trying to set up my own C++ message loop to listen
+                   to window messages looking for a focus change. */
+                if (loot.settings.autoRefresh) {
+                    window.addEventListener('focus', onFocus, false);
+                }
 
-            if (!loot.settings.lastVersion || loot.settings.lastVersion != loot.version) {
-                document.getElementById('firstRun').showModal();
-            }
+                if (!loot.settings.lastVersion || loot.settings.lastVersion != loot.version) {
+                    document.getElementById('firstRun').showModal();
+                }
+            });
         }).catch(processCefError);
 
     }).catch(processCefError);
@@ -1423,8 +1317,6 @@ function onFocus(evt) {
             }
             if (!foundPlugin) {
                 /* Remove plugin. */
-                loot.game.plugins[i].card.parentElement.removeChild(loot.game.plugins[i].card);
-                loot.game.plugins[i].li.parentElement.removeChild(loot.game.plugins[i].li);
                 loot.game.plugins.splice(i, 1);
             } else {
                 ++i;
@@ -1434,14 +1326,17 @@ function onFocus(evt) {
         sortUIElements(pluginNames);
 
         /* Reapply filters. */
-        applyFilters();
+        setFilteredUIData();
 
         closeProgressDialog();
     }).catch(processCefError);
 }
 
 window.addEventListener('polymer-ready', function(e) {
-    require(['bower_components/marked/lib/marked', 'js/l10n', 'js/plugin'], function(markedResponse, l10nResponse) {
+    /* Set the plugin list's scroll target to its parent. */
+    document.getElementById('main').querySelector('core-list').scrollTarget = document.getElementById('main');
+
+    require(['bower_components/marked/lib/marked', 'js/l10n', 'js/plugin', 'js/filters'], function(markedResponse, l10nResponse) {
         marked = markedResponse;
         l10n = l10nResponse;
         /* Make sure settings are what I want. */
diff --git a/resources/report/report.html b/resources/report/report.html
index 98632534..c64eed71 100644
--- a/resources/report/report.html
+++ b/resources/report/report.html
@@ -5,7 +5,6 @@
     <link rel="stylesheet" href="css/style.css" />
     <link rel="stylesheet" href="css/overrides.css" />
 
-    <script src="bower_components/platform/platform.js"></script>
     <link rel="import" href="bower_components/polymer/polymer.html">
 
     <link rel="import" href="html/editable-table.html">
@@ -20,12 +19,12 @@
     <link rel="import" href="bower_components/core-icons/core-icons.html">
     <link rel="import" href="bower_components/core-tooltip/core-tooltip.html">
     <link rel="import" href="bower_components/core-drawer-panel/core-drawer-panel.html">
-    <link rel="import" href="bower_components/core-menu/core-menu.html">
-    <link rel="import" href="bower_components/core-menu/core-submenu.html">
+    <link rel="import" href="bower_components/core-animated-pages/core-animated-pages.html">
+    <link rel="import" href="bower_components/core-animated-pages/transitions/slide-from-right.html">
+    <link rel="import" href="bower_components/core-list/core-list.html">
 
     <link rel="import" href="bower_components/paper-menu-button/paper-menu-button.html">
     <link rel="import" href="bower_components/paper-item/paper-item.html">
-    <link rel="import" href="bower_components/paper-dropdown-menu/paper-dropdown-menu.html">
     <link rel="import" href="bower_components/paper-icon-button/paper-icon-button.html">
     <link rel="import" href="bower_components/paper-button/paper-button.html">
     <link rel="import" href="bower_components/paper-input/paper-input.html">
@@ -33,24 +32,57 @@
     <link rel="import" href="bower_components/paper-checkbox/paper-checkbox.html">
     <link rel="import" href="bower_components/paper-dialog/paper-dialog.html">
     <link rel="import" href="bower_components/paper-dialog/paper-dialog-transition.html">
+    <link rel="import" href="bower_components/paper-dropdown/paper-dropdown.html">
+    <link rel="import" href="bower_components/paper-progress/paper-progress.html">
+    <link rel="import" href="bower_components/paper-toast/paper-toast.html">
 
     <script src="bower_components/requirejs/require.js"></script>
 </head>
 <!-- oncontextmenu attribute disables the right-click menu. -->
 <body oncontextmenu="return false" unresolved fullbleed vertical layout >
     <core-toolbar id="mainToolbar">
-        <paper-menu-button icon="menu">
-            <paper-item id="redatePluginsButton" icon="today" label="Redate Plugins"></paper-item>
-            <paper-item id="wipeUserlistButton" icon="delete" label="Clear All User Metadata"></paper-item>
-            <paper-item id="copyContentButton" icon="content-copy" label="Copy Content As Text"></paper-item>
-            <paper-item id="refreshContentButton" icon="cached" label="Refresh Content"></paper-item>
-            <paper-item separator></paper-item>
-            <paper-item id="settingsButton" icon="settings" label="Settings"></paper-item>
-            <paper-item separator></paper-item>
-            <paper-item id="helpButton" icon="book" label="View Documentation"></paper-item>
-            <paper-item id="openLogButton" icon="folder" label="Open Debug Log Location"></paper-item>
-            <paper-item id="aboutButton" icon="help" label="About"></paper-item>
+        <paper-menu-button>
+            <paper-icon-button icon="menu"></paper-icon-button>
+            <paper-dropdown class="dropdown">
+                <div>
+                    <paper-item id="redatePluginsButton">
+                        <core-icon icon="today"></core-icon>
+                        Redate Plugins
+                    </paper-item>
+                    <paper-item id="wipeUserlistButton">
+                        <core-icon icon="delete"></core-icon>
+                        Clear All User Metadata
+                    </paper-item>
+                    <paper-item id="copyContentButton">
+                        <core-icon icon="content-copy"></core-icon>
+                        Copy Content As Text
+                    </paper-item>
+                    <paper-item id="refreshContentButton">
+                        <core-icon icon="cached"></core-icon>
+                        Refresh Content
+                    </paper-item>
+                    <paper-item separator></paper-item>
+                    <paper-item id="settingsButton">
+                        <core-icon icon="settings"></core-icon>
+                        Settings
+                    </paper-item>
+                    <paper-item separator></paper-item>
+                    <paper-item id="helpButton">
+                        <core-icon icon="book"></core-icon>
+                        View Documentation
+                    </paper-item>
+                    <paper-item id="openLogButton">
+                        <core-icon icon="folder"></core-icon>
+                        Open Debug Log Location
+                    </paper-item>
+                    <paper-item id="aboutButton">
+                        <core-icon icon="help"></core-icon>
+                        About
+                    </paper-item>
+                </div>
+            </paper-dropdown>
         </paper-menu-button>
+        <paper-icon-button icon="drawer" id="drawerToggle"></paper-icon-button>
         <loot-dropdown-menu id="gameMenu">
             <!-- Generated game <li> elements go here. -->
         </loot-dropdown-menu>
@@ -64,41 +96,50 @@
         <paper-button id="applySortButton" class="hidden">Apply</paper-button>
         <paper-button id="cancelSortButton" class="hidden">Cancel</paper-button>
     </core-toolbar>
-    <core-drawer-panel id="container">
+    <core-drawer-panel id="container" drawerWidth="33%">
         <div drawer vertical layout>
             <paper-tabs id="sidebarTabs" selected="0">
                 <paper-tab>Plugins</paper-tab>
                 <paper-tab>Filters</paper-tab>
             </paper-tabs>
-            <core-menu id="cardsNav" class="tab-content" flex>
-                <paper-item label="Summary">
-                    <a href="#summary"></a>
-                </paper-item>
-                <paper-item label="General Messages">
-                    <a href="#generalMessages"></a>
-                </paper-item>
-                <!-- Generated <loot-plugin-item> elements go here, containing # links to each plugin's section in the list. -->
-            </core-menu>
-            <core-menu id="filters" class="tab-content hidden" flex>
-                <paper-checkbox id="hideVersionNumbers" data-class="version" label="Hide version numbers"></paper-checkbox>
-                <paper-checkbox id="hideCRCs" data-class="crc" label="Hide CRCs"></paper-checkbox>
-                <paper-checkbox id="hideBashTags" data-class="tag" label="Hide Bash Tags"></paper-checkbox>
-                <paper-checkbox id="hideNotes" label="Hide notes"></paper-checkbox>
-                <paper-checkbox id="hideDoNotCleanMessages" label="Hide 'Do not clean' messages"></paper-checkbox>
-                <paper-checkbox id="hideInactivePluginMessages" label="Hide inactive plugin messages"></paper-checkbox>
-                <paper-checkbox id="hideAllPluginMessages" label="Hide all plugin messages"></paper-checkbox>
-                <paper-checkbox id="hideMessagelessPlugins" label="Hide messageless plugins"></paper-checkbox>
-                <div center horizontal layout>
-                    <div id="hiddenPluginsTxt" flex>Hidden plugins:</div>
-                    <div><span id="hiddenPluginNo">0</span> / <span id="filterTotalPluginNo">0</span></div>
+            <core-animated-pages selected="0" transitions="slide-from-right" flex>
+                <div id="cardsNav" class="tab-content" layout vertical>
+                    <paper-item>
+                        <a href="#summary"></a>Summary
+                    </paper-item>
+                    <paper-item>
+                        <a href="#generalMessages"></a>General Messages
+                    </paper-item>
+                    <core-list flex>
+                        <template>
+                            <loot-plugin-item data-bsa?="{{model.loadsBSA}}" data-edits?="{{model.userlist != undefined}}" data-index="{{index}}">
+                                {{model.name}}
+                            </loot-plugin-item>
+                        </template>
+                        <!-- Generated <loot-plugin-item> elements go here. -->
+                    </core-list>
                 </div>
-                <div center horizontal layout>
-                    <div id="hiddenMessagesTxt" flex>Hidden messages:</div>
-                    <div><span id="hiddenMessageNo">0</span> / <span id="filterTotalMessageNo">0</span></div>
+                <div id="filters" class="tab-content" flex>
+                    <paper-checkbox id="hideVersionNumbers" data-class="version" label="Hide version numbers"></paper-checkbox>
+                    <paper-checkbox id="hideCRCs" data-class="crc" label="Hide CRCs"></paper-checkbox>
+                    <paper-checkbox id="hideBashTags" data-class="tag" label="Hide Bash Tags"></paper-checkbox>
+                    <paper-checkbox id="hideNotes" label="Hide notes"></paper-checkbox>
+                    <paper-checkbox id="hideDoNotCleanMessages" label="Hide 'Do not clean' messages"></paper-checkbox>
+                    <paper-checkbox id="hideAllPluginMessages" label="Hide all plugin messages"></paper-checkbox>
+                    <paper-checkbox id="hideInactivePlugins" label="Hide inactive plugins"></paper-checkbox>
+                    <paper-checkbox id="hideMessagelessPlugins" label="Hide messageless plugins"></paper-checkbox>
+                    <div center horizontal layout>
+                        <div id="hiddenPluginsTxt" flex>Hidden plugins:</div>
+                        <div><span id="hiddenPluginNo">0</span> / <span id="filterTotalPluginNo">0</span></div>
+                    </div>
+                    <div center horizontal layout>
+                        <div id="hiddenMessagesTxt" flex>Hidden messages:</div>
+                        <div><span id="hiddenMessageNo">0</span> / <span id="filterTotalMessageNo">0</span></div>
+                    </div>
                 </div>
-            </core-menu>
-            <core-tooltip label="Press Enter when searching to select the next match." position="top">
-                <paper-input id="searchBox" type="search" label="Search content..."></paper-input>
+            </core-animated-pages>
+            <core-tooltip label="Press Enter or click outside the input to set the filter." position="top">
+                <paper-input id="searchBox" label="Filter content..."></paper-input>
             </core-tooltip>
         </div>
         <div main id="main">
@@ -155,9 +196,26 @@
                     <!-- Generated message <li> elements go here. -->
                 </ul>
             </section>
-            <!-- Generated plugin <loot-plugin-card> elements go here. -->
+            <core-list>
+                <template>
+                    <loot-plugin-card data="{{model}}" id="{{model.id}}" data-active="{{model.isActive}}" data-dummy="{{model.isDummy}}" data-bsa="{{model.loadsBSA}}" data-edits="{{model.userlist != undefined}}">
+                        <h1>{{model.name}}</h1>
+                        <span class="version">{{model.version}}</span>
+                        <span class="crc"></span>
+                        <span class="tag add"></span>
+                        <span class="tag remove"></span>
+                        <ul></ul>
+                    </loot-plugin-card>
+                </template>
+                <!-- Generated <loot-plugin-card> elements go here. -->
+            </core-list>
         </div>
     </core-drawer-panel>
+    <paper-toast id="toast"></paper-toast>
+    <loot-dialog id="progressDialog">
+        <paper-progress indeterminate></paper-progress>
+        <p>Calculating the last digit of &pi;...</p>
+    </loot-dialog>
 
     <loot-dialog id="about" heading="About LOOT">
         <p>Version <span id="LOOTVersion"></span> (build <span id="LOOTBuild"></span>)</p>
@@ -185,7 +243,7 @@ along with LOOT. If not, see &lt;http://www.gnu.org/licenses/&gt;.
         <div center horizontal layout>
             <div>Default Game</div>
             <loot-dropdown-menu id="defaultGameSelect">
-                <paper-item value="auto" label="Autodetect"></paper-item>
+                <paper-item value="auto">Autodetect</paper-item>
                 <!-- Game <option> elements go here. -->
             </loot-dropdown-menu>
         </div>
@@ -227,17 +285,6 @@ along with LOOT. If not, see &lt;http://www.gnu.org/licenses/&gt;.
         <paper-button class="cancel" affirmative>Cancel</paper-button>
     </loot-dialog>
 
-    <div id="hoverText" class="hidden"></div>
-    <loot-dialog id="progressDialog">
-        <!-- CEF doesn't seem to want to play any animation set through CSS
-             for <progress>'s internal value pseudo-element, so use this
-             instead. -->
-        <div class="progress bar">
-            <div class="value"></div>
-        </div>
-        <h1>Calculating the last digit of &pi;...</h1>
-    </loot-dialog>
-
     <loot-dialog id="firstRun" heading="First-Time Tips">
         <p>This appears to be the first time you have run LOOT v<span id="firstTimeLootVersion"></span>. Here are some tips to help you get started with the interface.</p>
         <ul>
diff --git a/src/gui/handler.cpp b/src/gui/handler.cpp
index b49c22dd..6ee0c1dd 100644
--- a/src/gui/handler.cpp
+++ b/src/gui/handler.cpp
@@ -196,13 +196,7 @@ namespace loot {
                                      CefRefPtr<Callback> callback) {
         const string requestName = request["name"].as<string>();
 
-        if (requestName == "find") {
-            // Has one arg, which is the search string.
-            Find(browser, request["args"][0].as<string>(), request["args"][1].as<bool>());
-            callback->Success("");
-            return true;
-        }
-        else if (requestName == "changeGame") {
+        if (requestName == "changeGame") {
             try {
                 // Has one arg, which is the folder name of the new game.
                 g_app_state.ChangeGame(request["args"][0].as<string>());
@@ -302,13 +296,6 @@ namespace loot {
 
             return true;
         }
-        else if (requestName == "saveFilterState") {
-            const string id = request["args"][0].as<string>();
-            const string value = request["args"][1].as<string>();
-            SaveFilterState(id, value);
-            callback->Success("");
-            return true;
-        }
         else if (requestName == "copyContent") {
             // Has one arg, just convert it to a YAML output string.
             try {
@@ -334,13 +321,6 @@ namespace loot {
         return false;
     }
 
-    void Handler::Find(CefRefPtr<CefBrowser> browser, const std::string& search, bool findNext) {
-        // Only one search at a time is allowed, so give a constant identifier,
-        // and we want case-insensitive forward searching, with no repeated
-        // searches.
-        browser->GetHost()->Find(0, search, true, false, findNext);
-    }
-
     void Handler::GetConflictingPlugins(const std::string& pluginName, CefRefPtr<CefFrame> frame, CefRefPtr<Callback> callback) {
         BOOST_LOG_TRIVIAL(debug) << "Searching for plugins that conflict with " << pluginName;
 
@@ -422,20 +402,6 @@ namespace loot {
             return "null";
     }
 
-    void Handler::SaveFilterState(const std::string& id, const std::string& value) {
-        BOOST_LOG_TRIVIAL(trace) << "Saving state of filter " << id << " as " << value;
-        YAML::Node settings = g_app_state.GetSettings();
-
-        if (value == "true")
-            settings["filters"][id] = true;
-        else if (value == "false" || value.empty())
-            settings["filters"].remove(id);
-        else
-            settings["filters"][id] = value;
-
-        g_app_state.UpdateSettings(settings);
-    }
-
     std::string Handler::ApplyUserEdits(const YAML::Node& pluginMetadata) {
         BOOST_LOG_TRIVIAL(trace) << "Applying user edits for: " << pluginMetadata["name"].as<string>();
         // Create new object for userlist entry.
diff --git a/src/gui/handler.h b/src/gui/handler.h
index 60a3cccf..320c9268 100644
--- a/src/gui/handler.h
+++ b/src/gui/handler.h
@@ -66,11 +66,9 @@ namespace loot {
                                 YAML::Node& request,
                                 CefRefPtr<Callback> callback);
 
-        void Find(CefRefPtr<CefBrowser> browser, const std::string& search, bool findNext);
         void GetConflictingPlugins(const std::string& pluginName, CefRefPtr<CefFrame> frame, CefRefPtr<Callback> callback);
         void CopyMetadata(const std::string& pluginName);
         std::string ClearPluginMetadata(const std::string& pluginName);
-        void SaveFilterState(const std::string& filterId, const std::string& value);
         std::string ApplyUserEdits(const YAML::Node& pluginMetadata);
 
         YAML::Node GenerateDerivedMetadata(const std::string& pluginName);