Minor UI and route changes