Further refinements to the toggle and Chosen