Removed navigation bug after selecting location
removed conflicts