Tidied routes and added logout