[DO NOT MERGE] Team UI, part 2