Work on slider and base map interface
Work on base maps
Fix merge conflict