Renamed menu for consistency, added google maps fixes