Tidying up some routes and views