updated UI and form validation