Added location to map
Fixed GPS service and map