Moved all location handling. Well practically everything from main into Map activity