Add Infiniti choice widget (more see #618)