Added geolocation and window size detection