Refactor views, move navigation to index page
Turn map markers into a service
Properly persist map state in Map service