Added validation for dropdown, and save state