Added some required fields and fixed the submit