Refactors fetch of geolocation data
Refactors router and views