Added Geolocation support; updated design;