diff --git a/templates/base.html b/templates/base.html
index 7815966..a161891 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -76,9 +76,7 @@
         <aside class="main-sidebar sidebar-dark-primary elevation-4">
             <!-- Brand Logo -->
             <a href="/" class="brand-link">
-                <!-- <img src="static/dist/img/logo.png" alt="Wireguard UI"
-                    class="brand-image img-circle elevation-3" style="opacity: .8"> -->
-                <span class="brand-text font-weight-light">WIREGUARD UI</span>
+                <span class="brand-text">&nbsp; WIREGUARD UI</span>
             </a>
 
             <!-- Sidebar -->
@@ -96,6 +94,7 @@
                 <!-- Sidebar Menu -->
                 <nav class="mt-2">
                     <ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="menu" data-accordion="false">
+                        <li class="nav-header">MAIN</li>
                         <li class="nav-item">
                             <a href="/" class="nav-link {{if eq .baseData.Active ""}}active{{end}}">
                                 <i class="nav-icon fas fa-user-secret"></i>
@@ -112,6 +111,7 @@
                                 </p>
                             </a>
                         </li>
+                        <li class="nav-header">SETTINGS</li>
                         <li class="nav-item">
                             <a href="/global-settings" class="nav-link {{if eq .baseData.Active "global-settings" }}active{{end}}">
                                 <i class="nav-icon fas fa-cog"></i>
@@ -120,9 +120,10 @@
                                 </p>
                             </a>
                         </li>
+                        <li class="nav-header">UTILITIES</li>
                         <li class="nav-item">
                             <a href="/status" class="nav-link {{if eq .baseData.Active "status" }}active{{end}}">
-                                <i class="nav-icon fas fa-user"></i>
+                                <i class="nav-icon fas fa-signal"></i>
                                 <p>
                                     Status
                                 </p>
@@ -132,7 +133,7 @@
                             <a href="/wake_on_lan_hosts" class="nav-link {{if eq .baseData.Active "wake_on_lan_hosts" }}active{{end}}">
                                 <i class="nav-icon fas  fa-solid fa-power-off"></i>
                                 <p>
-                                    Wake On Lan Hosts
+                                    WoL Hosts
                                 </p>
                             </a>
                         </li>
@@ -167,14 +168,23 @@
                                 <input type="text" data-role="tagsinput" class="form-control" id="client_allocated_ips">
                             </div>
                             <div class="form-group">
-                                <label for="client_allowed_ips" class="control-label">Allowed IPs</label>
+                                <label for="client_allowed_ips" class="control-label">Allowed IPs
+                                    <i class="fas fa-info-circle" data-toggle="tooltip"
+                                       data-original-title="Specify a list of addresses that will get routed to the
+                                       server. These addresses will be included in 'AllowedIPs' of client config">
+                                    </i>
+                                </label>
                                 <input type="text" data-role="tagsinput" class="form-control" id="client_allowed_ips"
                                     value="0.0.0.0/0">
                             </div>
                             <div class="form-group">
-                                <label for="client_extra_allowed_ips" class="control-label">Extra Allowed IPs</label>
-                                <input type="text" data-role="tagsinput" class="form-control"
-                                     id="client_extra_allowed_ips">
+                                <label for="client_extra_allowed_ips" class="control-label">Extra Allowed IPs
+                                    <i class="fas fa-info-circle" data-toggle="tooltip"
+                                       data-original-title="Specify a list of addresses that will get routed to the
+                                       client. These addresses will be included in 'AllowedIPs' of WG server config">
+                                    </i>
+                                </label>
+                                <input type="text" data-role="tagsinput" class="form-control" id="client_extra_allowed_ips">
                             </div>
                             <div class="form-group">
                                 <div class="icheck-primary d-inline">