cleaned up code and added button to tour locations and return