Fixed routing
Changed major to submajor in the map
UI fixes