Group+Name Display+State Refactoring