Restructured form and form validation for new drug page