Moved location selection inside dropdown.