diff --git a/Plan/common/src/main/resources/assets/plan/web/error.html b/Plan/common/src/main/resources/assets/plan/web/error.html
index 1f86208aa..a15684585 100644
--- a/Plan/common/src/main/resources/assets/plan/web/error.html
+++ b/Plan/common/src/main/resources/assets/plan/web/error.html
@@ -31,12 +31,10 @@
     <!-- Sidebar -->
     <ul class="navbar-nav bg-plan sidebar sidebar-dark accordion" id="accordionSidebar">
 
-        <!-- Sidebar - Brand -->
         <a class="sidebar-brand d-flex align-items-center justify-content-center">
             <img alt="logo" class="w-22" src="img/Flaticon_circle.png">
         </a>
 
-        <!-- Divider -->
         <hr class="sidebar-divider my-0">
 
         <li class="nav-item nav-button active">
@@ -45,7 +43,6 @@
                 <span>to main page</span></a>
         </li>
 
-        <!-- Divider -->
         <hr class="sidebar-divider">
 
         <div class="ml-3 align-items-center justify-content-between">
@@ -71,7 +68,6 @@
 
         <!-- Main Content -->
         <div id="content" style="display: flex;">
-            <!-- Begin Player Overview Tab -->
             <div class="tab" id="information" style="width: 100%;">
                 <div class="container-fluid mt-4">
                     <!-- Page Heading -->
@@ -80,7 +76,6 @@
                     </div>
 
                     <div class="row">
-                        <!-- Card -->
                         <div class="col-xs-12 col-sm-12 col-lg-11">
                             <div class="card shadow mb-4">
                                 <div class="card-body" id="data_player_info">
diff --git a/Plan/common/src/main/resources/assets/plan/web/js/query.js b/Plan/common/src/main/resources/assets/plan/web/js/query.js
index f61f70c42..2f6076b7c 100644
--- a/Plan/common/src/main/resources/assets/plan/web/js/query.js
+++ b/Plan/common/src/main/resources/assets/plan/web/js/query.js
@@ -1,9 +1,5 @@
 let filterCount = 0;
 
-/* {
-    id: "DOM id",
-    options...
-}*/
 let timestamp = undefined;
 let filterView = {
     afterDate: null,
diff --git a/Plan/common/src/main/resources/assets/plan/web/network.html b/Plan/common/src/main/resources/assets/plan/web/network.html
index 446766f8e..cc4b9d96f 100644
--- a/Plan/common/src/main/resources/assets/plan/web/network.html
+++ b/Plan/common/src/main/resources/assets/plan/web/network.html
@@ -40,28 +40,23 @@
     <!-- Sidebar -->
     <ul class="navbar-nav bg-plan sidebar sidebar-dark accordion" id="accordionSidebar">
 
-        <!-- Sidebar - Brand -->
         <a class="sidebar-brand d-flex align-items-center justify-content-center">
             <img alt="logo" class="w-22" src="./img/Flaticon_circle.png">
         </a>
 
-        <!-- Divider -->
         <hr class="sidebar-divider my-0">
 
-        <!-- Nav Item - Dashboard -->
         <li class="nav-item nav-button active">
             <a class="nav-link" href="#tab-network-overview">
                 <i class="fas fa-fw fa-info-circle"></i>
                 <span>Network Overview</span></a>
         </li>
 
-        <!-- Divider -->
         <hr class="sidebar-divider">
-        <!-- Heading -->
         <div class="sidebar-heading">
             Information
         </div>
-        <!-- Nav Item - Pages Collapse Menu -->
+
         <li class="nav-item">
             <a aria-controls="serverPages" aria-expanded="true" class="nav-link collapsed" data-target="#serverPages"
                data-toggle="collapse" href="#">
@@ -79,7 +74,7 @@
                 </div>
             </div>
         </li>
-        <!-- Nav Item - Pages Collapse Menu -->
+
         <li class="nav-item">
             <a aria-controls="playerbasePages" aria-expanded="true" class="nav-link collapsed"
                data-target="#playerbasePages"
@@ -100,18 +95,14 @@
                 </div>
             </div>
         </li>
-        <!-- Nav Item - Pages Collapse Menu -->
 
-        <!-- Divider -->
         <hr class="sidebar-divider">
 
-        <!-- Heading -->
         <div class="sidebar-heading">
             Plugins
         </div>
         ${navPluginsTabs}
 
-        <!-- Divider -->
         <hr class="sidebar-divider">
 
         <div class="query-buttons">
diff --git a/Plan/common/src/main/resources/assets/plan/web/player.html b/Plan/common/src/main/resources/assets/plan/web/player.html
index e5e750b6b..b04921ac7 100644
--- a/Plan/common/src/main/resources/assets/plan/web/player.html
+++ b/Plan/common/src/main/resources/assets/plan/web/player.html
@@ -40,12 +40,10 @@
     <!-- Sidebar -->
     <ul class="navbar-nav bg-plan sidebar sidebar-dark accordion" id="accordionSidebar">
 
-        <!-- Sidebar - Brand -->
         <a class="sidebar-brand d-flex align-items-center justify-content-center">
             <img alt="logo" class="w-22" src="../img/Flaticon_circle.png">
         </a>
 
-        <!-- Divider -->
         <hr class="sidebar-divider my-0">
 
         <li class="nav-item nav-button active">
@@ -54,7 +52,6 @@
                 <span>Player Overview</span></a>
         </li>
 
-        <!-- Divider -->
         <hr class="sidebar-divider">
 
         <div class="sidebar-heading">
@@ -73,7 +70,6 @@
                 <span>PvP & PvE</span></a>
         </li>
 
-        <!-- Divider -->
         <hr class="sidebar-divider">
 
         <div class="sidebar-heading">
@@ -99,7 +95,6 @@
             </div>
         </li>
 
-        <!-- Divider -->
         <hr class="sidebar-divider">
 
         <div class="ml-3 align-items-center justify-content-between">
diff --git a/Plan/common/src/main/resources/assets/plan/web/players.html b/Plan/common/src/main/resources/assets/plan/web/players.html
index be4b324f1..fd096898b 100644
--- a/Plan/common/src/main/resources/assets/plan/web/players.html
+++ b/Plan/common/src/main/resources/assets/plan/web/players.html
@@ -31,12 +31,10 @@
     <!-- Sidebar -->
     <ul class="navbar-nav bg-plan sidebar sidebar-dark accordion" id="accordionSidebar">
 
-        <!-- Sidebar - Brand -->
         <a class="sidebar-brand d-flex align-items-center justify-content-center">
             <img alt="logo" class="w-22" src="img/Flaticon_circle.png">
         </a>
 
-        <!-- Divider -->
         <hr class="sidebar-divider my-0">
 
         <li class="nav-item nav-button active">
@@ -45,7 +43,6 @@
                 <span>to main page</span></a>
         </li>
 
-        <!-- Divider -->
         <hr class="sidebar-divider">
 
         <div class="query-buttons">
diff --git a/Plan/common/src/main/resources/assets/plan/web/query.html b/Plan/common/src/main/resources/assets/plan/web/query.html
index a1cd17378..6a86aaae1 100644
--- a/Plan/common/src/main/resources/assets/plan/web/query.html
+++ b/Plan/common/src/main/resources/assets/plan/web/query.html
@@ -30,12 +30,10 @@
     <!-- Sidebar -->
     <ul class="navbar-nav bg-plan sidebar sidebar-dark accordion" id="accordionSidebar">
 
-        <!-- Sidebar - Brand -->
         <a class="sidebar-brand d-flex align-items-center justify-content-center">
             <img class="w-22" src="img/Flaticon_circle.png">
         </a>
 
-        <!-- Divider -->
         <hr class="sidebar-divider my-0">
 
         <li class="nav-item nav-button">
@@ -50,7 +48,6 @@
                 <span>to main page</span></a>
         </li>
 
-        <!-- Divider -->
         <hr class="sidebar-divider">
 
         <div class="ml-3 align-items-center justify-content-between">
@@ -82,7 +79,6 @@
                     </div>
 
                     <div class="row">
-                        <!-- Card -->
                         <div class="col-xs-12 col-sm-12 col-lg-12">
                             <div class="card shadow mb-4">
                                 <div class="card-body" id="data_player_info">
diff --git a/Plan/common/src/main/resources/assets/plan/web/server.html b/Plan/common/src/main/resources/assets/plan/web/server.html
index 1f00def58..a92896d01 100644
--- a/Plan/common/src/main/resources/assets/plan/web/server.html
+++ b/Plan/common/src/main/resources/assets/plan/web/server.html
@@ -38,12 +38,10 @@
     <!-- Sidebar -->
     <ul class="navbar-nav bg-plan sidebar sidebar-dark accordion" id="accordionSidebar">
 
-        <!-- Sidebar - Brand -->
         <a class="sidebar-brand d-flex align-items-center justify-content-center">
             <img alt="logo" class="w-22" src="../img/Flaticon_circle.png">
         </a>
 
-        <!-- Divider -->
         <hr class="sidebar-divider my-0">
 
         <li class="nav-item nav-button active">
@@ -52,7 +50,6 @@
                 <span>Server Overview</span></a>
         </li>
 
-        <!-- Divider -->
         <hr class="sidebar-divider">
 
         <div class="sidebar-heading">
@@ -109,7 +106,6 @@
                 <span>Performance</span></a>
         </li>
 
-        <!-- Divider -->
         <hr class="sidebar-divider">
 
         <div class="sidebar-heading">
@@ -117,7 +113,6 @@
         </div>
         ${navPluginsTabs}
 
-        <!-- Divider -->
         <hr class="sidebar-divider">
 
         <div class="query-buttons">
@@ -1020,7 +1015,7 @@
                     </div>
 
                     <div class="row">
-                        <!-- Online Activity as Numbers -->
+                        <!-- Performance as Numbers -->
                         <div class="col-lg-8 mb-8 col-sm-12">
                             <div class="card shadow mb-4">
                                 <div class="card-header py-3">
@@ -1097,7 +1092,7 @@
                                     </tbody>
                                 </table>
                             </div>
-                        </div> <!-- End of Online Activity as numbers-->
+                        </div> <!-- End of Performance as numbers-->
                         <!-- Insights -->
                         <div class="col-lg-4 mb-4 col-sm-12">
                             <div class="card shadow mb-4">