Fixed some the UI issues with groups