updated form, model with validations etc