Changes to view routing for UX