Fix editing the form and use mixins