Added new selection elements and form validation