pulled in roisins changes, moving around the menu and added information to map points