Fixed issues related to Gym Locator
Fixed issues with Gym Locator