Fixing form bug, add require fields and email validation