Controller tidy up and some new routes added