diff --git a/doc/Extensions/Agent-Setup.md b/doc/Extensions/Agent-Setup.md
index 7ec1e8083..3e562c058 100644
--- a/doc/Extensions/Agent-Setup.md
+++ b/doc/Extensions/Agent-Setup.md
@@ -14,6 +14,7 @@ On each of the hosts you would like to use the agent on then you need to do the
 ```shell
 cd /opt/
 git clone https://github.com/librenms/librenms-agent.git
+cd librenms-agent
 cp check_mk_agent /usr/bin/check_mk_agent
 chmod +x /usr/bin/check_mk_agent
 ```
diff --git a/doc/Extensions/Network-Map.md b/doc/Extensions/Network-Map.md
index b231a318b..5a2f38049 100644
--- a/doc/Extensions/Network-Map.md
+++ b/doc/Extensions/Network-Map.md
@@ -1,6 +1,6 @@
 # Network Map
 
-## LibreNMS has the ability to show you a network mab based on:
+## LibreNMS has the ability to show you a network map based on:
 
 - xDP Discovery
 - MAC addresses
diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index e42c634e9..a24f91c75 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -140,11 +140,17 @@ if ($_SESSION['userlevel'] >= '10') {
             </li>
             ');
     }
-    echo('
+    echo '
             <li role="presentation" class="divider"></li>
-            <li><a href="'.generate_url(array('page'=>'device-groups')).'"><i class="fa fa-th fa-fw fa-lg"></i> Manage Groups</a></li>
+         ';
+
+    if ($config['navbar']['manage_groups']['hide'] === 0) {
+        echo '<li><a href="'.generate_url(array('page'=>'device-groups')).'"><i class="fa fa-th fa-fw fa-lg"></i> Manage Groups</a></li>';
+    }
+
+     echo '
             <li><a href="addhost/"><i class="fa fa-plus fa-col-success fa-fw fa-lg"></i> Add Device</a></li>
-            <li><a href="delhost/"><i class="fa fa-trash fa-col-info fa-fw fa-lg"></i> Delete Device</a></li>');
+            <li><a href="delhost/"><i class="fa fa-trash fa-col-info fa-fw fa-lg"></i> Delete Device</a></li>';
 }
 
 ?>
diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index 6563e76e7..1bb2c00a1 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -781,3 +781,6 @@ $config['mapael']['default_map']                        = 'maps/world_countries.
 $config['leaflet']['default_lat']                       = '50.898482';
 $config['leaflet']['default_lng']                       = '-3.401402';
 $config['leaflet']['default_zoom']                       = 2;
+
+// Navbar variables
+$config['navbar']['manage_groups']['hide']              = 0;