diff --git a/templates/adblock.php b/templates/adblock.php
index b14a268f..1897d39a 100755
--- a/templates/adblock.php
+++ b/templates/adblock.php
@@ -2,7 +2,7 @@
     <?php if (!RASPI_MONITOR_ENABLED) : ?>
       <input type="submit" class="btn btn-outline btn-primary" name="saveadblocksettings" value="<?php echo _("Save settings"); ?>">
       <?php if ($dnsmasq_state) : ?>
-        <input type="submit" class="btn btn-warning" name="stopadblock" value="<?php echo _("Stop Ad Blocking"); ?>">
+        <input type="submit" class="btn btn-warning" name="restartadblock" value="<?php echo _("Restart Ad Blocking"); ?>">
       <?php else : ?>
         <input type="submit" class="btn btn-success" name="startadblock" value="<?php echo _("Start Ad Blocking"); ?>">
       <?php endif ?>
@@ -36,76 +36,15 @@
             </ul>
             <!-- Tab panes -->
             <div class="tab-content">
+              <?php echo renderTemplate("adblock/general", $__template_data) ?>
+              <?php echo renderTemplate("adblock/logging", $__template_data) ?>
+            </div><!-- /.tab-content -->
 
-              <!-- blocklist settings tab -->
-              <div class="tab-pane active" id="adblocklistsettings">
-
-                <div class="row">
-                  <div class="col-md-6">
-                    <h4 class="mt-3"><?php echo _("Blocklist settings"); ?></h4>
-
-                      <div class="input-group">
-                        <input type="hidden" name="adblock-enable" value="0">
-                        <div class="custom-control custom-switch">
-                          <input class="custom-control-input" id="adblock-enable" type="checkbox" name="adblock-enable" value="1" <?php echo $arrConf['addn-hosts'] ? ' checked="checked"' : "" ?> aria-describedby="adblock-description">
-                        <label class="custom-control-label" for="adblock-enable"><?php echo _("Enable blocklists") ?></label>
-                      </div>
-                      <p id="adblock-description">
-                        <small><?php echo _("Enable this option if you want RaspAP to <b>block DNS requests for ads, tracking and other virtual garbage</b>. Blocklists are gathered from multiple, actively maintained sources and automatically updated, cleaned, optimized and moderated on a daily basis.") ?></small>
-                        <div class="mb-3">
-                          <small class="text-muted"><?php echo _("This option adds <code>conf-file</code> and <code>addn-hosts</code> to the dnsmasq configuration.") ?></small>
-                        </div>
-                      </p>
-                      </div>
-
-                      <div class="row">
-                        <div class="input-group col-md-12 mb-4">
-                          <select class="custom-select custom-select-sm" id="cbxblocklist" onchange="clearBlocklistStatus()">
-                            <option value=""><?php echo _("Choose a blocklist provider") ?></option>
-                            <option disabled="disabled"></option>
-                            <?php echo optionsForSelect(blocklistProviders()) ?>
-                          </select>
-                          <div class="input-group-append">
-                            <button class="btn btn-sm btn-outline-secondary rounded-right" type="button" onclick="updateBlocklist()"><?php echo _("Update now"); ?></button>
-                            <span id="cbxblocklist-status" class="input-group-addon check-hidden ml-2 mt-1"><i class="fas fa-check"></i></span>
-                          </div>
-                        </div>
-                      </div>
-
-                  </div>
-                </div><!-- /.row -->
-              </div><!-- /.tab-pane | advanded tab -->
-
-              <!-- logging tab -->
-              <div class="tab-pane fade" id="adblocklogfileoutput">
-                <h4 class="mt-3"><?php echo _("Blocklist log"); ?></h4>
-                <div class="row">
-                  <div class="form-group col-md-8">
-                    <?php
-                    $log = '';
-                    exec('sudo chmod o+r /tmp/dnsmasq.log');
-                    $handle = fopen("/tmp/dnsmasq.log", "r");
-                    if ($handle) {
-                        while (($line = fgets($handle)) !== false) {
-                            if (preg_match('/(0.0.0.0)/', $line)){
-                                $log.=$line;
-                            }
-                        }
-                    } else {
-                        $log = "Unable to open log file";
-                    }
-                    fclose($handle);
-                    echo '<textarea class="logoutput">'.htmlspecialchars($log, ENT_QUOTES).'</textarea>';
-                    ?>
-                  </div>
-                </div>
-              </div>
-              <?php echo $buttons ?>
-              </form>
-            </div>
+          <?php echo $buttons ?>
+          </form>
         </div><!-- /.card-body -->
         <div class="card-footer"><?php echo _("Information provided by adblock"); ?></div>
-  </div><!-- /.card -->
-</div><!-- /.col-lg-12 -->
-</div><!-- /.row -->
+      </div><!-- /.card -->
+    </div><!-- /.col-lg-12 -->
+  </div><!-- /.row -->
 
diff --git a/templates/adblock/general.php b/templates/adblock/general.php
new file mode 100644
index 00000000..0d669c17
--- /dev/null
+++ b/templates/adblock/general.php
@@ -0,0 +1,35 @@
+<!-- blocklist settings tab -->
+<div class="tab-pane active" id="adblocklistsettings">
+  <div class="row">
+    <div class="col-md-6">
+      <h4 class="mt-3"><?php echo _("Blocklist settings"); ?></h4>
+        <div class="input-group">
+          <input type="hidden" name="adblock-enable" value="0">
+          <div class="custom-control custom-switch">
+            <input class="custom-control-input" id="adblock-enable" type="checkbox" name="adblock-enable" value="1" <?php echo $arrConf['addn-hosts'] ? ' checked="checked"' : "" ?> aria-describedby="adblock-description">
+          <label class="custom-control-label" for="adblock-enable"><?php echo _("Enable blocklists") ?></label>
+        </div>
+        <p id="adblock-description">
+          <small><?php echo _("Enable this option if you want RaspAP to <b>block DNS requests for ads, tracking and other virtual garbage</b>. Blocklists are gathered from multiple, actively maintained sources and automatically updated, cleaned, optimized and moderated on a daily basis.") ?></small>
+          <div class="mb-3">
+            <small class="text-muted"><?php echo _("This option adds <code>conf-file</code> and <code>addn-hosts</code> to the dnsmasq configuration.") ?></small>
+          </div>
+        </p>
+        </div>
+        <div class="row">
+          <div class="input-group col-md-12 mb-4">
+            <select class="custom-select custom-select-sm" id="cbxblocklist" onchange="clearBlocklistStatus()">
+              <option value=""><?php echo _("Choose a blocklist provider") ?></option>
+              <option disabled="disabled"></option>
+              <?php echo optionsForSelect(blocklistProviders()) ?>
+            </select>
+            <div class="input-group-append">
+              <button class="btn btn-sm btn-outline-secondary rounded-right" type="button" onclick="updateBlocklist()"><?php echo _("Update now"); ?></button>
+              <span id="cbxblocklist-status" class="input-group-addon check-hidden ml-2 mt-1"><i class="fas fa-check"></i></span>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div><!-- /.row -->
+  </div><!-- /.tab-pane | advanded tab -->
+
diff --git a/templates/adblock/logging.php b/templates/adblock/logging.php
new file mode 100644
index 00000000..c210ebdb
--- /dev/null
+++ b/templates/adblock/logging.php
@@ -0,0 +1,25 @@
+<!-- logging tab -->
+<div class="tab-pane fade" id="adblocklogfileoutput">
+  <h4 class="mt-3"><?php echo _("Blocklist log"); ?></h4>
+    <div class="row">
+      <div class="form-group col-md-8">
+        <?php
+        $log = '';
+        exec('sudo chmod o+r /tmp/dnsmasq.log');
+        $handle = fopen("/tmp/dnsmasq.log", "r");
+        if ($handle) {
+          while (($line = fgets($handle)) !== false) {
+            if (preg_match('/(0.0.0.0)/', $line)){
+              $log.=$line;
+            }
+          }
+        } else {
+          $log = "Unable to open log file";
+        }
+        fclose($handle);
+        echo '<textarea class="logoutput">'.htmlspecialchars($log, ENT_QUOTES).'</textarea>';
+        ?>
+    </div>
+  </div>
+</div><!-- /.tab-pane -->
+