Fix UX issues with task type options in Workflow

Ref j/CORE-276