Updated navigation and routes