CMS-2661 Wizard - InputType Alignment