Working on layout, adding in geolocation