Group box refactoring