Varun/location ui tweaks