Merge changes from group meeting (stub expandable lists, font changes,
color changes, etc)