Add validations to models, new look, order of fields