Fixed location submission as well as added a proper back button.