Brought back geolocation. Fixed closed button on info dialog of shown locations. Some minor formatting and refactoring.