Updated the navigation mode in locateActivity and some minor UI changes