Fixed the problem of the enter button submitting the forms incorrectly. Cleaned up validations on models