Added more methods to ControlPanel to enable it to use new buttons in layout, half added geolocation back to main activity