Most of the way through layout reorganisation and titles. Still following stuff in users_controller and favourites to check