Add email validator, fix file field and small updates