Added geolocation and fixed layout margins