diff --git a/resources/report/css/style.css b/resources/report/css/style.css
index 472a4d07..26ea3d26 100644
--- a/resources/report/css/style.css
+++ b/resources/report/css/style.css
@@ -395,10 +395,10 @@ td input {
     width: 100%;
     text-overflow: ellipsis;
 }
-.editable td:last-child span {
+.editable td:last-child {
     cursor: pointer;
 }
-.editable td:last-child span:hover {
+.editable td:last-child:hover {
     color: red;
 }
 .editable {
diff --git a/resources/report/js/script.js b/resources/report/js/script.js
index eed43740..da7957c2 100644
--- a/resources/report/js/script.js
+++ b/resources/report/js/script.js
@@ -207,7 +207,7 @@ function clearMetadata(filename) {
     showMessageDialog('Clear Plugin Metadata', 'Are you sure you want to clear all existing user-added metadata from "' + filename + '"?');
 }
 function removeTableRow(evt) {
-    evt.target.parentElement.parentElement.parentElement.removeChild(evt.target.parentElement.parentElement);
+    evt.target.parentElement.parentElement.removeChild(evt.target.parentElement);
 }
 function addNewTableRow(evt) {
     /* Create new row. */
@@ -422,7 +422,7 @@ function processButtonClick(evt) {
             }
         }
     } else if (action == 'show-menu') {
-        target = evt.target.nextSibling;
+        target = evt.target.nextElementSibling;
         if (isVisible(target)) {
             hideElement(target);
         } else {
diff --git a/resources/report/report.html b/resources/report/report.html
index c00777bf..6487157e 100644
--- a/resources/report/report.html
+++ b/resources/report/report.html
@@ -13,7 +13,7 @@
             <td><input class="file" type="text" readonly required>
             <td><input class="display" type="text" readonly>
             <td><input class="condition" type="text" readonly>
-            <td><span class="fa fa-trash-o fa-fw"></span>
+            <td class="fa fa-trash-o fa-fw">
     </template>
     <template id="messageRow">
         <tr>
@@ -27,7 +27,7 @@
             <td><select class="language">
                     <!-- Language <option> elements go here. -->
                 </select>
-            <td><span class="fa fa-trash-o fa-fw"></span>
+            <td class="fa fa-trash-o fa-fw">
     </template>
     <template id="tagRow">
         <tr>
@@ -37,7 +37,7 @@
                 </select>
             <td><input class="name" type="text" readonly required>
             <td><input class="condition" type="text" readonly>
-            <td><span class="fa fa-trash-o fa-fw"></span>
+            <td class="fa fa-trash-o fa-fw">
     </template>
     <template id="dirtyInfoRow">
         <tr>
@@ -46,7 +46,7 @@
             <td><input class="udr" type="number" min="0" step="1" readonly>
             <td><input class="navmesh" type="number" min="0" step="1" readonly>
             <td><input class="utility" type="text" readonly required>
-            <td><span class="fa fa-trash-o fa-fw"></span>
+            <td class="fa fa-trash-o fa-fw">
     </template>
     <template id="gameRow">
         <tr>
@@ -61,13 +61,13 @@
             <td><input class="branch" type="text" readonly>
             <td><input class="path" type="text" readonly>
             <td><input class="registryKey" type="text" readonly>
-            <td><span class="fa fa-trash-o fa-fw"></span>
+            <td class="fa fa-trash-o fa-fw">
     </template>
     <template id="pluginNav">
         <li>
             <span class="dummyPlugin" title="Dummy Plugin"></span>
             <span class="loadsBSA" title="Loads BSA"></span>
-            <span class="hasUserEdits"  title="Has User Metadata"></span>
+            <span class="hasUserEdits" title="Has User Metadata"></span>
             <a href="">
                 <span class="name"></span>
                 <span class="priority"></span>
@@ -82,7 +82,7 @@
                 <div class="tag add"></div>
                 <div class="tag remove"></div>
                 <ul>
-
+                    <!-- Plugin message <li> elements go here. -->
                 </ul>
                 <ol class="icons">
                     <li class="dummyPlugin fa fa-eye-slash hidden" title="Dummy Plugin">