diff --git a/plugins/draw-tools.user.js b/plugins/draw-tools.user.js
index 4d302982..c5d38c7d 100644
--- a/plugins/draw-tools.user.js
+++ b/plugins/draw-tools.user.js
@@ -119,14 +119,31 @@ window.plugin.drawTools.boot = function() {
   //create a leaflet FeatureGroup to hold drawn items
 
   window.plugin.drawTools.drawnItems = new L.FeatureGroup();
-  var drawnItems = window.plugin.drawTools.drawnItems;
-
-  window.layerChooser.addOverlay(drawnItems, 'Drawn Items');
-  map.addLayer(drawnItems);
 
   //add the draw control - this references the above FeatureGroup for editing purposes
   plugin.drawTools.addDrawControl();
 
+  //start off hidden. if the layer is enabled, the below addLayerGroup will add it, triggering a 'show'
+  $('.leaflet-draw-section').hide();
+
+
+  //hide the draw tools when the 'drawn items' layer is off, show it when on
+  map.on('layeradd', function(obj) {
+    if(obj.layer === window.plugin.drawTools.drawnItems) {
+      $('.leaflet-draw-section').show();
+    }
+  });
+  map.on('layerremove', function(obj) {
+    if(obj.layer === window.plugin.drawTools.drawnItems) {
+      $('.leaflet-draw-section').hide();
+    }
+  });
+
+  //add the layer
+  window.addLayerGroup('Drawn Items', window.plugin.drawTools.drawnItems);
+
+
+  //place created items into the specific layer
   map.on('draw:created', function(e) {
     var type=e.layerType;
     var layer=e.layer;
diff --git a/plugins/max-links.user.js b/plugins/max-links.user.js
index 8759a208..8571b1b1 100644
--- a/plugins/max-links.user.js
+++ b/plugins/max-links.user.js
@@ -116,7 +116,7 @@ window.plugin.maxLinks.setup = function() {
       window.plugin.maxLinks.updateLayer();
   });
   window.map.on('zoomend moveend', window.plugin.maxLinks.updateLayer);
-  window.layerChooser.addOverlay(window.plugin.maxLinks.layer, 'Maximum Links');
+  window.addLayerGroup('Maximum Links', window.plugin.maxLinks.layer);
 }
 var setup = window.plugin.maxLinks.setup;
 
diff --git a/plugins/player-tracker.user.js b/plugins/player-tracker.user.js
index 92160fce..3c04b65b 100644
--- a/plugins/player-tracker.user.js
+++ b/plugins/player-tracker.user.js
@@ -47,8 +47,7 @@ window.plugin.playerTracker.setup = function() {
   }});
 
   plugin.playerTracker.drawnTraces = new L.LayerGroup();
-  window.layerChooser.addOverlay(plugin.playerTracker.drawnTraces, 'Player Tracker');
-  map.addLayer(plugin.playerTracker.drawnTraces);
+  window.addLayerGroup('Player Tracker', plugin.playerTracker.drawnTraces);
   map.on('layeradd',function(obj) {
     if(obj.layer === plugin.playerTracker.drawnTraces)
     {
diff --git a/plugins/portal-level-numbers.user.js b/plugins/portal-level-numbers.user.js
index b070b160..43535562 100644
--- a/plugins/portal-level-numbers.user.js
+++ b/plugins/portal-level-numbers.user.js
@@ -77,8 +77,7 @@ var setup =  function() {
           }")
   .appendTo("head");
 
-  window.layerChooser.addOverlay(window.plugin.portalLevelNumbers.levelLayerGroup, 'Portal Levels');
-  map.addLayer(window.plugin.portalLevelNumbers.levelLayerGroup);
+  window.addLayerGroup('Portal Levels', window.plugin.portalLevelNumbers.levelLayerGroup, true);
 
   window.addHook('portalAdded', window.plugin.portalLevelNumbers.portalAdded);
 }