Add display argument to some groups, organize