controlpanel & list-group partial refactoring