Messing with states and controllers to find out why controllers are call...

...ed twice upon template load

Dit some more work on leaflet draw and triggers