Cleaning up routes, adding logout