Copied some changes from NewGroupsBranch

I need the new UI to read/write from