Adding group toggle
Merge branch 'add_group_toggle' into gh-pages