Updated some naming; List -> Group for ui components, misc changes.