Many more refactorings of routes and views. Not done yet