Expandable list has been added, as well as groups