Index: src/django_gheat/wlheatmap/static/heatmap.js
===================================================================
--- src/django_gheat/wlheatmap/static/heatmap.js	(revision 9598)
+++ src/django_gheat/wlheatmap/static/heatmap.js	(revision 9599)
@@ -57,19 +57,4 @@
   map.addLayer(layerMapnik);
 
-  layerHeatmap2 = new OpenLayers.Layer.OSM.Overlay2("All Access points", {isBaseLayer: false, visibility: false});
-  //map.addLayer(layerHeatmap2);
-
-  signallayer = new OpenLayers.Layer.OSM.Overlay4("signallayer", {isBaseLayer: false, visibility: false});
-  map.addLayer(signallayer);
-
-  layerHeatmap3 = new OpenLayers.Layer.OSM.Overlay3("Wireless Leiden Coverage", {isBaseLayer: false, visibility: true});
-  map.addLayer(layerHeatmap3);
-
-  layerHeatmap = new OpenLayers.Layer.OSM.Overlay1("Original Heatmap generator", {isBaseLayer: false, visibility: false});
-  //map.addLayer(layerHeatmap);
-
-  var nodesLayer = new OpenLayers.Layer.GML.NodesOverlay("Node Locations", "feature/nodes.json", {isBaseLayer: false, visibility: true});
-  map.addLayer(nodesLayer);
-
   var lonLat = new OpenLayers.LonLat(lon, lat).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject());
   map.setCenter (lonLat, zoom);
@@ -77,17 +62,22 @@
 
   /**
-   * Layers above are put in switcher, category 'default', with code below.
-   * TODO: Make process for putting layers into layerswitcher dynamic instead of putting every layer there manually.
+   * Layers are created and put in switcher
    */
+  function add_item(category, layer) {
+    map.addLayer(layer);
+    var checked = '';
+    if (layer.getVisibility()) { checked = "checked='checked'"; };
+    $("#" + category).append("<span id=\"" + layer.name + "\">" +
+     " <div id='layer_switcher_colour' style='background-color:rgb(" + layer.colour + ")' />" +
+     "<input type='checkbox' id='togglelayer' " + checked + " /><font>" + layer.name + " </font><br /></span>"
+     );
+  }
 
-  //$("#default").append("<span id=\"" + layerHeatmap.name + "\"><div id='layer_switcher_colour' style='background-color:rgb(" + layerHeatmap.colour + ")' /><input type=checkbox id=togglelayer /><font>" + layerHeatmap.name + " </font><br /></span>");
+  var signallayer = new OpenLayers.Layer.OSM.Overlay4("signallayer", {isBaseLayer: false, visibility: false});
+  var wlsignalLayer = new OpenLayers.Layer.OSM.Overlay3("Wireless Leiden Coverage", {isBaseLayer: false, visibility: true});
+  var nodesLayer = new OpenLayers.Layer.GML.NodesOverlay("Node Locations", {isBaseLayer: false, visibility: false});
 
-  //$("#default").append("<span id=\"" + layerHeatmap2.name + "\"><div id='layer_switcher_colour' style='background-color:rgb(" + layerHeatmap2.colour + ")' /><input type=checkbox id=togglelayer /><font>" + layerHeatmap2.name + " </font><br /></span>");
-
-  $("#default").append("<span id=\"" + signallayer.name + "\"><div id='layer_switcher_colour' style='background-color:rgb(" + signallayer.colour + ")' /><input type=checkbox id=togglelayer /><font>Replaced during init</font><br /></span>");
-
-  $("#default").append("<span id=\"" + layerHeatmap3.name + "\"><div id='layer_switcher_colour' style='background-color:rgb(" + layerHeatmap3.colour + ")' /><input type=checkbox id=togglelayer checked/><font>" + layerHeatmap3.name + " </font><br /></span>");
-
-  $("#features").append("<span id=\"" + nodesLayer.name + "\"><div id='layer_switcher_colour' style='background-color:rgb(" + nodesLayer.colour + ")' /><input type=checkbox id=togglelayer checked/><font>" + nodesLayer.name + " </font><br /></span>");
-
+  add_item('default', signallayer);
+  add_item('default', wlsignalLayer);
+  add_item('features', nodesLayer);
 }
Index: src/django_gheat/wlheatmap/templates/home.html
===================================================================
--- src/django_gheat/wlheatmap/templates/home.html	(revision 9598)
+++ src/django_gheat/wlheatmap/templates/home.html	(revision 9599)
@@ -98,5 +98,5 @@
       <div id="layer_switcher_cat">
         <div id="cat_hide"></div>
-        <input type=checkbox id=togglecat class=custom checked />Features
+        <input type=checkbox id=togglecat class=features />Features
       </div><p><span id="features"></span></p>
     </div>