Improving the UI and adding more functionality to set location action