Tiny fix. Added item groups
Merged with ui upstream