Geolocation working but still some formatting errors.
Merge remote-tracking branch 'origin/Working'