Work on adding route map
UI fixes
Merge latest commits from dev branch