Refactored Location Dropdown