Grab and log client's geolocation
Updating and organizing menu
fixing merge conflicts