Add geo location and refactoring js controller.
Update geo location