Geolocation + Modal handling refactoring progress