Added options for the control group.
Updated bootstrap js.
Merge