diff --git a/includes/networking.php b/includes/networking.php
index 9669fca4..83c587ed 100755
--- a/includes/networking.php
+++ b/includes/networking.php
@@ -1,12 +1,12 @@
 <?php
 
 require_once 'includes/internetRoute.php';
+require_once 'includes/functions.php';
 
 /**
- *
- *
+ * Displays a networking summary and network diagnostic tools
  */
-function DisplayNetworkingConfig()
+function DisplayNetworkingConfig(&$extraFooterScripts)
 {
     $status = new \RaspAP\Messages\StatusMessage;
 
@@ -23,4 +23,5 @@ function DisplayNetworkingConfig()
         "routeInfoRaw",
         "bridgedEnabled")
     );
+    $extraFooterScripts[] = array('src'=>'app/js/speedtestUI.js', 'defer'=>false);
 }
diff --git a/templates/networking.php b/templates/networking.php
index f1cd45c3..1767878d 100755
--- a/templates/networking.php
+++ b/templates/networking.php
@@ -1,7 +1,7 @@
+
 <div class="row">
   <div class="col-lg-12">
     <div class="card">
-
       <div class="card-header">
         <div class="row">
           <div class="col">
@@ -9,96 +9,24 @@
           </div>
         </div><!-- ./row -->
       </div><!-- ./card-header -->
-
       <div class="card-body">
+        <?php $status->showMessages(); ?>
+        <form role="form" action="network_conf" method="POST" class="needs-validation" novalidate>
+        <?php echo \RaspAP\Tokens\CSRF::hiddenField(); ?>
         <div id="msgNetworking"></div>
+        <!-- Nav tabs -->
         <ul class="nav nav-tabs">
-          <li role="presentation" class="nav-item"><a class="nav-link active" href="#summary" aria-controls="summary" role="tab" data-bs-toggle="tab"><?php echo _("Summary"); ?></a></li>
+          <li class="nav-item"><a class="nav-link active" href="#summary" aria-controls="summary" role="tab" data-bs-toggle="tab"><?php echo _("Summary"); ?></a></li>
+          <?php if (!$bridgedEnabled) : // no interface details when bridged ?>
+            <li class="nav-item"><a class="nav-link" href="#diagnostic" aria-controls="diagnostic" role="tab" data-bs-toggle="tab"><?php echo _("Diagnostics"); ?></a></li>
+          <?php endif ?>
         </ul>
+
+        <!-- Tab panes -->
         <div class="tab-content">
-          <div role="tabpanel" class="tab-pane active" id="summary">
-            <h4 class="mt-3"><?php echo _("Internet connection"); ?></h4>
-            <div class="row">
-              <div class="col-sm-12">
-                <div class="table-responsive">
-                  <table class="table">
-                    <thead>
-                      <tr>
-                        <th><?php echo _("Interface"); ?></th>
-                        <th><?php echo _("IP Address"); ?></th>
-                        <th><?php echo _("Gateway"); ?></th>
-                        <th colspan="2"><?php echo _("Internet Access"); ?></th>
-                      </tr>
-                    </thead>
-                    <tbody>
-                      <?php if (isset($routeInfo["error"]) || empty($routeInfo)): ?>
-                      <tr><td colspan=5>No route to the internet found</td></tr>
-                      <?php else: ?>
-                        <?php foreach($routeInfo as $route): ?>
-                          <tr>
-                            <td><?php echo $route['interface'] ?></td>
-                            <td><?php echo $route['ip-address'] ?></td>
-                            <td><?php echo $route['gateway'] ?><br><?php $route['gw-name'] ?></td>
-                            <td>
-                              <p class="m-0">
-                                <i class="fas <?php echo $route["access-ip"] ? "fa-check" : "fa-times"; ?>"></i> <?php echo RASPI_ACCESS_CHECK_IP ?>
-                              </p>
-                              <p class="m-0">
-                                <i class="fas <?php echo $route["access-dns"] ? "fa-check" : "fa-times"; ?>"></i> <?php echo RASPI_ACCESS_CHECK_DNS ?>
-                              </p>
-                            </td>
-                          </tr>
-                        <?php endforeach ?>
-                      <?php endif ?>
-                    </tbody>
-                  </table>
-                </div>
-              </div>
-            </div>
-
-            <h4 class="mt-3"><?php echo _("Routing table"); ?></h4>
-            <div class="card h-100 w-100">
-              <div class="card-header"><?php echo _("raw output") ?></div>
-              <div class="card-body">
-                <div class="row">
-                  <div class="col-sm-12">
-                    <div class="table-responsive">
-                      <table class="table">
-                        <tbody>
-                          <?php foreach($routeInfoRaw as $route): ?>
-                            <tr>
-                              <pre class="unstyled"><?php echo $route; ?></pre>
-                            </tr>
-                          <?php endforeach ?>
-                        </tbody>
-                      </table>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-
-            <h4 class="mt-3"><?php echo _("Current settings") ?></h4>
-            <div class="row">
-              <?php if (!$bridgedEnabled) : // No interface details when bridged ?>
-                <?php foreach ($interfaces as $if): ?>
-                  <?php $if_quoted = htmlspecialchars($if, ENT_QUOTES) ?>
-                  <div class="col-md mb-3">
-                    <div class="card h-100 w-100">
-                      <div class="card-header"><?php echo $if_quoted ?></div>
-                      <div class="card-body">
-                        <pre class="unstyled" id="<?php echo $if_quoted ?>-summary"></pre>
-                      </div>
-                    </div>
-                  </div>
-                <?php endforeach ?>
-              <?php endif ?>
-            </div><!-- /.row -->
-
-            <button type="button" onClick="window.location.reload();" class="btn btn-outline btn-primary"><i class="fas fa-sync-alt"></i> <?php echo _("Refresh") ?></a>
-
-          </div>
-        </div>
+            <?php echo renderTemplate("networking/general", $__template_data) ?>
+            <?php echo renderTemplate("networking/diagnostics", $__template_data) ?>
+        </div><!-- /.tab-content -->
       </div><!-- /.card-body -->
 
       <div class="card-footer"><?php echo _("Information provided by /sys/class/net"); ?></div>