Add Location support and update Location Label in View