Markers maintain state, decoupled from everything but router

Refactored those views that draw things on the map. They maintain state and can easily be turned off and on without requiring lengthy re-calculations. They are directly controlled by Router and nothing else.