diff --git a/peach-web/templates/help.html.tera b/peach-web/templates/help.html.tera
index 8167f67..4baa227 100644
--- a/peach-web/templates/help.html.tera
+++ b/peach-web/templates/help.html.tera
@@ -12,10 +12,6 @@
           <!-- display error message -->
           <div class="center-text flash-message font-failure" style="padding-left: 5px;">{{ flash_msg }}.</div>
           {%- endif %}
-          <!-- share ux information with the user if JS is disabled -->
-          <noscript>
-            <p class="center-text flash-message">This website will be unresponsive while the device shuts down or reboots.</p>
-          </noscript>
         </div>
       </div>
 {%- endblock card -%}
diff --git a/peach-web/templates/home.html.tera b/peach-web/templates/home.html.tera
index 14edce6..23920be 100644
--- a/peach-web/templates/home.html.tera
+++ b/peach-web/templates/home.html.tera
@@ -24,9 +24,8 @@
           </div>
         </a>
         <!-- middle -->
-        <a class="middle" href="/hello">
-          <div class="circle circle-large">
-          </div>
+        <a class="middle">
+          <div class="circle circle-large"></div>
         </a>
         <!-- bottom-left -->
         <!-- SYSTEM STATUS LINK AND ICON -->
diff --git a/peach-web/templates/scuttlebutt/messages.html.tera b/peach-web/templates/scuttlebutt/messages.html.tera
index 394f0b0..979a68c 100644
--- a/peach-web/templates/scuttlebutt/messages.html.tera
+++ b/peach-web/templates/scuttlebutt/messages.html.tera
@@ -5,8 +5,6 @@
         <div class="card-container">
           <!-- FLASH MESSAGE -->
           {% include "snippets/flash_message" %}
-          <!-- NO SCRIPT FOR WHEN JS IS DISABLED -->
-          {% include "snippets/noscript" %}
         </div>
       </div>
 {%- endblock card -%}
diff --git a/peach-web/templates/settings/admin/add_admin.html.tera b/peach-web/templates/settings/admin/add_admin.html.tera
index 5c04908..158bad9 100644
--- a/peach-web/templates/settings/admin/add_admin.html.tera
+++ b/peach-web/templates/settings/admin/add_admin.html.tera
@@ -10,13 +10,8 @@
               <a class="button button-secondary center" href="/settings/admin/configure" title="Cancel">Cancel</a>
             </div>
           </form>
-
-            <!-- FLASH MESSAGE -->
-           {% include "snippets/flash_message" %}
-
-           <!-- NO SCRIPT FOR WHEN JS IS DISABLED -->
-           {% include "snippets/noscript" %}
-
+          <!-- FLASH MESSAGE -->
+          {% include "snippets/flash_message" %}
         </div>
       </div>
 {%- endblock card -%}
diff --git a/peach-web/templates/settings/admin/change_password.html.tera b/peach-web/templates/settings/admin/change_password.html.tera
index 65250c7..fe30e82 100644
--- a/peach-web/templates/settings/admin/change_password.html.tera
+++ b/peach-web/templates/settings/admin/change_password.html.tera
@@ -3,7 +3,7 @@
       <!-- CHANGE PASSWORD FORM -->
       <div class="card center">
         <div class="form-container">
-          <form id="changePassword" action="/settings/change_password" method="post">
+          <form id="changePassword" action="/settings/admin/change_password" method="post">
             <!-- input for current password -->
             <input id="currentPassword" class="center input" name="current_password" type="password" placeholder="Current password" title="Current password" autofocus>
             <!-- input for new password -->
diff --git a/peach-web/templates/settings/admin/configure_admin.html.tera b/peach-web/templates/settings/admin/configure_admin.html.tera
index 2d3435f..f19cead 100644
--- a/peach-web/templates/settings/admin/configure_admin.html.tera
+++ b/peach-web/templates/settings/admin/configure_admin.html.tera
@@ -20,11 +20,7 @@
           {% endif %}
           <a class="button button-primary center full-width" style="margin-top: 25px;" href="/settings/admin/add" title="Add Admin">Add Admin</a>
         </div>
-
         <!-- FLASH MESSAGE -->
         {% include "snippets/flash_message" %}
-
-        <!-- NO SCRIPT FOR WHEN JS IS DISABLED -->
-        {% include "snippets/noscript" %}
       </div>
 {%- endblock card -%}
diff --git a/peach-web/templates/settings/admin/forgot_password.html.tera b/peach-web/templates/settings/admin/forgot_password.html.tera
index 85eff50..f0a254e 100644
--- a/peach-web/templates/settings/admin/forgot_password.html.tera
+++ b/peach-web/templates/settings/admin/forgot_password.html.tera
@@ -14,7 +14,5 @@
         </form>
         <!-- FLASH MESSAGE -->
         {% include "snippets/flash_message" %}
-        <!-- NO SCRIPT FOR WHEN JS IS DISABLED -->
-        {% include "snippets/noscript" %}
       </div>
 {%- endblock card -%}
diff --git a/peach-web/templates/settings/network/add_ap.html.tera b/peach-web/templates/settings/network/add_ap.html.tera
index 440363e..21aa1e1 100644
--- a/peach-web/templates/settings/network/add_ap.html.tera
+++ b/peach-web/templates/settings/network/add_ap.html.tera
@@ -3,7 +3,7 @@
       <!-- NETWORK ADD CREDENTIALS FORM -->
       <div class="card center">
         <div class="card-container">
-          <form id="wifiCreds" action="/network/wifi/add" method="post">
+          <form id="wifiCreds" action="/settings/network/wifi/add" method="post">
             <!-- input for network ssid -->
             <input id="ssid" name="ssid" class="center input" type="text" placeholder="SSID" title="Network name (SSID) for WiFi access point" value="{%- if selected -%}{{ selected }}{%- endif -%}" autofocus>
             <!-- input for network password -->
diff --git a/peach-web/templates/settings/network/data_usage_limits.html.tera b/peach-web/templates/settings/network/data_usage_limits.html.tera
index af93ae1..b36baf2 100644
--- a/peach-web/templates/settings/network/data_usage_limits.html.tera
+++ b/peach-web/templates/settings/network/data_usage_limits.html.tera
@@ -1,10 +1,19 @@
 {%- extends "nav" -%}
 {%- block card -%}
+      {# ASSIGN VARIABLES #}
+      {# ---------------- #}
+      {%- if data_total -%}
+      {% set data_usage_total = data_total.total / 1024 / 1024 | round -%}
+      {%- else -%}
+      {% set data_usage_total = "x" -%}
+      {% endif -%} 
       <!-- NETWORK DATA ALERTS VIEW -->
       <form id="wifiAlerts" action="/settings/network/wifi/usage" class="card center" method="post">
         <div class="stack capsule" style="margin-left: 2rem; margin-right: 2rem;">
           <div class="flex-grid">
-            <label id="dataTotal" class="label-large" title="Data download total in MB">{{ data_total.total / 1024 / 1024 | round }}</label>
+            <label id="dataTotal" class="label-large" title="Data download total in MB">
+              {{ data_usage_total }}
+            </label>
             <label class="label-small font-near-black">MB</label>
           </div>
           <label class="center-text label-small font-gray">USAGE TOTAL</label>