Fix wording and decision style component
Allow form tree specified when building form to specify the right type.