Routes refactor and cleanup
Refactor locations view