route + small UI and User experience changes