Fixes missing annotations on control group widget and introduces toggle group widget