Move announce group checkboxes into a component