Add more data, and group widgets.