Cosmetic fix on form
Moved validation to models