Redo location-ui branch