Group into Tool and Viewer instead