Validation is working, modals are now forms