Continuining work towards basic Leaflet.Draw support

Some work towards Leaflet.Draw support and refactorings