Move field labels and help text into model