diff --git a/templates/openvpn.php b/templates/openvpn.php
index 65976dee..02cf6b18 100755
--- a/templates/openvpn.php
+++ b/templates/openvpn.php
@@ -1,3 +1,15 @@
+  <?php ob_start() ?>
+    <?php if (!RASPI_MONITOR_ENABLED) : ?>
+        <input type="submit" class="btn btn-outline btn-primary" name="SaveOpenVPNSettings" value="Save settings" />
+        <?php if ($openvpnstatus[0] == 0) {
+            echo '<input type="submit" class="btn btn-success" name="StartOpenVPN" value="Start OpenVPN" />' , PHP_EOL;
+          } else {
+            echo '<input type="submit" class="btn btn-warning" name="StopOpenVPN" value="Stop OpenVPN" />' , PHP_EOL;
+          }
+        ?>
+    <?php endif ?>
+  <?php $buttons = ob_get_clean(); ob_end_clean() ?>
+ 
   <div class="row">
     <div class="col-lg-12">
       <div class="card">
@@ -21,70 +33,23 @@
             <!-- Nav tabs -->
             <ul class="nav nav-tabs">
                 <li class="nav-item"><a class="nav-link active" id="clienttab" href="#openvpnclient" data-toggle="tab"><?php echo _("Client settings"); ?></a></li>
-                <li class="nav-item"><a class="nav-link" id="logoutputtab" href="#openvpnlogoutput" data-toggle="tab"><?php echo _("Logfile output"); ?></a></li>
+                <li class="nav-item"><a class="nav-link" id="configstab" href="#openvpnconfigs" data-toggle="tab"><?php echo _("Manage configs"); ?></a></li>
+                <li class="nav-item"><a class="nav-link" id="loggingtab" href="#openvpnlogging" data-toggle="tab"><?php echo _("Logging"); ?></a></li>
             </ul>
+
             <!-- Tab panes -->
             <div class="tab-content">
-              <div class="tab-pane active" id="openvpnclient">
-                <h4 class="mt-3"><?php echo _("Client settings"); ?></h4>
-                <div class="row">
-                  <div class="col">
-                    <div class="row">
-                      <div class="col-lg-12 mt-2 mb-2">
-                        <div class="info-item"><?php echo _("IPv4 Address"); ?></div>
-                        <div class="info-item"><?php echo htmlspecialchars($public_ip, ENT_QUOTES); ?><a class="text-gray-500" href="https://ipapi.co/<?php echo($public_ip); ?>" target="_blank" rel="noopener noreferrer"><i class="fas fa-external-link-alt ml-2"></i></a></div>
-                      </div>
-                    </div>
-                    <div class="row">
-                     <div class="form-group col-lg-12">
-                      <label for="code"><?php echo _("Username"); ?></label>
-                        <input type="text" class="form-control" name="authUser" value="<?php echo htmlspecialchars($authUser, ENT_QUOTES); ?>" />
-                      </div>
-                    </div>
-                    <div class="row">
-                      <div class="form-group col-lg-12">
-                        <label for="code"><?php echo _("Password"); ?></label>
-                        <input type="password" class="form-control" name="authPassword" value="<?php echo htmlspecialchars($authPassword, ENT_QUOTES); ?>" />
-                      </div>
-                    </div>
-                    <div class="row">
-                      <div class="form-group col-lg-12">
-                        <div class="custom-file">
-                          <input type="file" class="custom-file-input" name="customFile" id="customFile">
-                          <label class="custom-file-label" for="customFile"><?php echo _("Select OpenVPN configuration file (.ovpn)"); ?></label>
-                        </div>
-                      </div>
-                    </div>
-                  </div><!-- col-->
-                  <div class="col-sm">
-                      <a href="https://go.nordvpn.net/aff_c?offer_id=15&aff_id=36402&url_id=902"><img src="app/img/180x150.png" class="rounded float-left mb-3 mt-3"></a>
-                  </div>
-                </div><!-- main row -->
-              </div>
-              <div class="tab-pane fade" id="openvpnlogoutput">
-                <h4 class="mt-3"><?php echo _("Client log"); ?></h4>
-                <div class="row">
-                  <div class="form-group col-md-8">
-                    <?php
-                        echo '<textarea class="logoutput"></textarea>';
-                    ?>
-                  </div>
-                </div>
-              </div>
-              <?php if (!RASPI_MONITOR_ENABLED) : ?>
-                  <input type="submit" class="btn btn-outline btn-primary" name="SaveOpenVPNSettings" value="Save settings" />
-                  <?php if ($openvpnstatus[0] == 0) {
-                      echo '<input type="submit" class="btn btn-success" name="StartOpenVPN" value="Start OpenVPN" />' , PHP_EOL;
-                    } else {
-                      echo '<input type="submit" class="btn btn-warning" name="StopOpenVPN" value="Stop OpenVPN" />' , PHP_EOL;
-                    }
-                  ?>
-              <?php endif ?>
-              </form>
-            </div>
+              <?php echo renderTemplate("openvpn/general", $__template_data) ?>
+              <?php echo renderTemplate("openvpn/configs", $__template_data) ?>
+              <?php echo renderTemplate("openvpn/logging", $__template_data) ?>
+            </div><!-- /.tab-content -->
+
+            <?php echo $buttons ?>
+            </form>
+          </div>
         </div><!-- /.card-body -->
-    <div class="card-footer"> Information provided by openvpn</div>
-  </div><!-- /.card -->
-</div><!-- /.col-lg-12 -->
+      <div class="card-footer"><?php echo _("Information provided by openvpn"); ?></div>
+    </div><!-- /.card -->
+  </div><!-- /.col-lg-12 -->
 </div><!-- /.row -->
 
diff --git a/templates/openvpn/configs.php b/templates/openvpn/configs.php
new file mode 100644
index 00000000..fd9fd3ef
--- /dev/null
+++ b/templates/openvpn/configs.php
@@ -0,0 +1,9 @@
+<div class="tab-pane fade" id="openvpnconfigs">
+  <h4 class="mt-3"><?php echo _("Manage configs"); ?></h4>
+  <div class="row">
+    <div class="form-group col-md-8">
+    </div>
+  </div><!-- /.row -->
+</div><!-- /.tab-pane | manage configs tab -->
+
+
diff --git a/templates/openvpn/general.php b/templates/openvpn/general.php
new file mode 100644
index 00000000..ddc751e7
--- /dev/null
+++ b/templates/openvpn/general.php
@@ -0,0 +1,37 @@
+<div class="tab-pane active" id="openvpnclient">
+  <h4 class="mt-3"><?php echo _("Client settings"); ?></h4>
+  <div class="row">
+    <div class="col">
+      <div class="row">
+        <div class="col-lg-12 mt-2 mb-2">
+          <div class="info-item"><?php echo _("IPv4 Address"); ?></div>
+          <div class="info-item"><?php echo htmlspecialchars($public_ip, ENT_QUOTES); ?><a class="text-gray-500" href="https://ipapi.co/<?php echo($public_ip); ?>" target="_blank" rel="noopener noreferrer"><i class="fas fa-external-link-alt ml-2"></i></a></div>
+        </div>
+      </div>
+      <div class="row">
+       <div class="form-group col-lg-12">
+        <label for="code"><?php echo _("Username"); ?></label>
+          <input type="text" class="form-control" name="authUser" value="<?php echo htmlspecialchars($authUser, ENT_QUOTES); ?>" />
+        </div>
+      </div>
+      <div class="row">
+        <div class="form-group col-lg-12">
+          <label for="code"><?php echo _("Password"); ?></label>
+          <input type="password" class="form-control" name="authPassword" value="<?php echo htmlspecialchars($authPassword, ENT_QUOTES); ?>" />
+        </div>
+      </div>
+      <div class="row">
+        <div class="form-group col-lg-12">
+          <div class="custom-file">
+            <input type="file" class="custom-file-input" name="customFile" id="customFile">
+            <label class="custom-file-label" for="customFile"><?php echo _("Select OpenVPN configuration file (.ovpn)"); ?></label>
+          </div>
+        </div>
+      </div>
+    </div><!-- col-->
+    <div class="col-sm">
+        <a href="https://go.nordvpn.net/aff_c?offer_id=15&aff_id=36402&url_id=902"><img src="app/img/180x150.png" class="rounded float-left mb-3 mt-3"></a>
+    </div>
+  </div><!-- /.row -->
+</div><!-- /.tab-pane | general tab -->
+
diff --git a/templates/openvpn/logging.php b/templates/openvpn/logging.php
new file mode 100644
index 00000000..caba8862
--- /dev/null
+++ b/templates/openvpn/logging.php
@@ -0,0 +1,11 @@
+<div class="tab-pane fade" id="openvpnlogging">
+  <h4 class="mt-3"><?php echo _("Client log"); ?></h4>
+  <div class="row">
+    <div class="form-group col-md-8">
+      <?php
+          echo '<textarea class="logoutput"></textarea>';
+      ?>
+    </div>
+  </div><!-- /.row -->
+</div><!-- /.tab-pane | logging tab -->
+