Adding measure control
Refactoring Features
zoomToShowLayer when using clustering