Added maxlength to some fields