       @map.on "overlayadd", (event) =>
         @layersScheduler.schedule event.layer
         console.log "Add legend control..."
-        legend = $(legendControl.getContainer())
+        legend = $(@controls.legendControl.getContainer())
         legend.children("#legend-#{event.layer.name}").show()
         legend.children(".first").removeClass("first")
         legend.children(":visible:first").addClass("first")
         legend.removeClass("empty")
         return
 
-      @map.on "overlayremove", (event) ->
+      @map.on "overlayremove", (event) =>
         console.log "Remove legend control..."
-        legend = $(legendControl.getContainer())
+        legend = $(@controls.legendControl.getContainer())
         legend.children("#legend-#{event.layer.name}").hide()
         legend.children(".first").removeClass("first")
         legend.children(":visible:first").addClass("first")
         legend.addClass("empty") if legend.children(":visible").length <= 0
         return
 
-      control = new L.Control.Layers(baseLayers, overlays, @options.controlDefaults.layerSelector)
-      @map.addControl control
+      @controls.layerSelector = new L.Control.Layers(baseLayers, overlays, @options.controlDefaults.layerSelector)
+      @map.addControl @controls.layerSelector
 
     _addScaleControl: (options) ->
       options = $.extend true, {}, @options.controlDefaults.scale, options
-      control = new L.Control.Scale options
-      @map.addControl control
+      @controls.scale = new L.Control.Scale options
+      @map.addControl @controls.scale
 
     _addZoomControl: (options) ->
       options = $.extend true, {}, @options.controlDefaults.zoom, options
-      control = new L.Control.Zoom options
-      @map.addControl control
+      @controls.zoom = new L.Control.Zoom options
+      @map.addControl @controls.zoom
 
 
     # Build a popup from given parameters. For now it only uses popup attribute of


        overlays[layer.name] = L.tileLayer(layer.url, opts)

      legendControl = new L.control(position: "bottomright")
      legendControl.onAdd = (map) ->
        L.DomUtil.create('div', 'leaflet-legend-control')
      @map.addControl legendControl

      $('.leaflet-legend-control').on 'click', () ->
        $(this).find('#legend-activity').toggleClass('minified')


    _addGeocoderControl: (options) ->
      options = $.extend true, {}, @options.controlDefaults.geocoder, options
      @controls.geocoder = new L.Control.OSMGeocoder options
      @map.addControl @controls.geocoder

    _addLayerSelectorControl: (options) ->
      baseLayers = {}
