Add RoadMap and various changes to navigation