Added toggle functionality for separate groups