moved type to the templte
Merge branch 'radio-buttons' into consumer-forms