diff --git a/templates/wg/general.php b/templates/wg/general.php
index ec44562a..686949bb 100644
--- a/templates/wg/general.php
+++ b/templates/wg/general.php
@@ -10,13 +10,13 @@
           <label class="custom-control-label" for="tunnel-enable"><?php echo _("Enable tunnel") ?></label>
         </div>
         <p id="wg-description">
-          <small><?php echo _("Enable this option to encrypt traffic on your local network by creating a tunnel between RaspAP and connected clients.") ?></small>
+          <small><?php echo _("Enable this option to encrypt traffic by creating a tunnel between RaspAP and configured peers.") ?></small>
         </p>
         </div>
         <div class="row">
           <div class="form-group col-xs-3 col-sm-3">
             <label for="code"><?php echo _("Local Port"); ?></label>
-            <input type="text" class="form-control" name="wgport" value="<?php echo htmlspecialchars($wg_port, ENT_QUOTES); ?>" />
+            <input type="text" class="form-control" name="wgport" placeholder="51820" value="<?php echo htmlspecialchars($wg_port, ENT_QUOTES); ?>" />
           </div>
         </div>
 
diff --git a/templates/wg/peers.php b/templates/wg/peers.php
index 2edc4d2d..16337a08 100644
--- a/templates/wg/peers.php
+++ b/templates/wg/peers.php
@@ -1,8 +1,51 @@
 <!-- wireguard peers tab -->
 <div class="tab-pane fade" id="wgpeers">
+
   <div class="row">
     <div class="col-md-6">
-      <h4 class="mt-3"><?php echo _("Peers"); ?></h4>
+      <h4 class="mt-3"><?php echo _("Peer"); ?></h4>
+        <div class="input-group">
+          <input type="hidden" name="endpoint-enable" value="0">
+          <input type="hidden" name="peer_id" value="1">
+          <div class="custom-control custom-switch">
+            <input class="custom-control-input" id="endpoint_enable" type="checkbox" name="endpoint-enable" value="1" <?php echo $enabled ? ' checked="checked"' : "" ?> aria-describedby="endpoint-description">
+          <label class="custom-control-label" for="endpoint_enable"><?php echo _("Enable endpoint") ?></label>
+        </div>
+     </div>
+
+    <div class="row">
+      <div class="form-group col-xs-3 col-sm-6 mt-3">
+        <label for="code"><?php echo _("Endpoint address"); ?></label>
+        <input type="text" class="form-control" name="wg_endpoint" value="<?php echo htmlspecialchars($wg_endpoint, ENT_QUOTES); ?>" />
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-xs-3 col-sm-6">
+        <label for="code"><?php echo _("Allowed IPs"); ?></label>
+        <input type="text" class="form-control mb-3" name="wg_allowedips" placeholder="0.0.0.0/0" value="<?php echo htmlspecialchars($wg_allowedips, ENT_QUOTES); ?>" />
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-xs-3 col-sm-6">
+        <label for="code"><?php echo _("Persistent keepalive"); ?></label>
+        <input type="text" class="form-control col-sm-3 mb-3" name="wg_pkeepalive" placeholder="25" value="<?php echo htmlspecialchars($wg_pkeepalive, ENT_QUOTES); ?>" />
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-xs-3 col-sm-6">
+          <label for="code"><?php echo _("Peer public key"); ?></label>
+      </div>
+      <div class="input-group col-md-12 mb-3">
+        <input type="text" class="form-control" name="wg_peerpubkey" value="<?php echo htmlspecialchars($wg_peerpubkey, ENT_QUOTES); ?>" />
+        <div class="input-group-append">
+          <button class="btn btn-sm btn-outline-secondary rounded-right" type="button" onclick="updateBlocklist()"><?php echo _("Generate key"); ?></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>
diff --git a/templates/wireguard.php b/templates/wireguard.php
index 0c0c0a81..3ead09c7 100644
--- a/templates/wireguard.php
+++ b/templates/wireguard.php
@@ -32,7 +32,7 @@
             <!-- Nav tabs -->
             <ul class="nav nav-tabs">
                 <li class="nav-item"><a class="nav-link active" id="settingstab" href="#wgsettings" data-toggle="tab"><?php echo _("Settings"); ?></a></li>
-                <li class="nav-item"><a class="nav-link" id="peertab" href="#wgpeers" data-toggle="tab"><?php echo _("Peers"); ?></a></li>
+                <li class="nav-item"><a class="nav-link" id="peertab" href="#wgpeers" data-toggle="tab"><?php echo _("Peer"); ?></a></li>
                 <li class="nav-item"><a class="nav-link" id="loggingtab" href="#wglogging" data-toggle="tab"><?php echo _("Logging"); ?></a></li>
             </ul>