Up checkbox, map fields. Fix ModelForm