Cleaning router and migrating views to new navigation