Map UI (kinda) works in a basic way. Weeee!
Merge branch 'markers'