Added Change Pickup location, change chat form location and minor fixes added..