diff --git a/progmgr/group.h b/progmgr/group.h
index b706f30..4d3a40b 100644
--- a/progmgr/group.h
+++ b/progmgr/group.h
@@ -62,8 +62,9 @@ typedef struct _GROUP {
 
 // Group window information
 typedef struct _GROUPWND {
-	// Window
+	// Windows
 	HWND hWndGroup;
+	HWND hWndListView;
 	// Group
 	PGROUP pGroup; // Pointer to GROUP structure
 } GROUPWND, * PGROUPWND;
diff --git a/progmgr/lang/dlg_en-US.rc b/progmgr/lang/dlg_en-US.rc
index e0ee0ba..92f5d52 100644
Binary files a/progmgr/lang/dlg_en-US.rc and b/progmgr/lang/dlg_en-US.rc differ
diff --git a/progmgr/lang/res_en-US.rc b/progmgr/lang/res_en-US.rc
index 06e3406..3e18f4a 100644
Binary files a/progmgr/lang/res_en-US.rc and b/progmgr/lang/res_en-US.rc differ
diff --git a/progmgr/registry.c b/progmgr/registry.c
index 881f452..d2ca039 100644
--- a/progmgr/registry.c
+++ b/progmgr/registry.c
@@ -126,7 +126,7 @@ DWORD SaveGroupToRegistry(_In_ PGROUP pg)
 		return RCE_FAILURE;
 
 	// Save group
-	if (!RegSetValueEx(hKeyProgramGroups, pg->szGroupName, 0, REG_BINARY,
+	if (!RegSetValueEx(hKeyProgramGroups, pg->szName, 0, REG_BINARY,
 		(const BYTE*)pg, (sizeof(*pg) + sizeof(ITEM) * pg->cItems)) == ERROR_SUCCESS)
 		dwConfigStatus = dwConfigStatus && RCE_GROUPS;
 
@@ -149,7 +149,7 @@ DWORD LoadGroupFromRegistry(_Inout_ PGROUP pg, _Out_ DWORD dwBufferSize)
 		return RCE_FAILURE;
 
 	// Load group
-	if (!RegQueryValueEx(hKeyProgramGroups, pg->szGroupName, 0, &dwType,
+	if (!RegQueryValueEx(hKeyProgramGroups, pg->szName, 0, &dwType,
 		(LPBYTE)pg, &dwBufferSize) == ERROR_SUCCESS)
 		dwConfigStatus = dwConfigStatus && RCE_POSITION;
 
diff --git a/progmgr/resource.h b/progmgr/resource.h
index 423df57..32cca67 100644
Binary files a/progmgr/resource.h and b/progmgr/resource.h differ