diff --git a/package.json b/package.json
index 4d7ad4c..25f798a 100644
--- a/package.json
+++ b/package.json
@@ -249,15 +249,15 @@
       },
       {
         "category": "GitHub Local Actions",
-        "command": "githubLocalActions.helpAndSupport",
-        "title": "Help and Support"
+        "command": "githubLocalActions.reportAnIssue",
+        "title": "Report an Issue"
       }
     ],
     "submenus": [
       {
-        "id": "githubLocalActions.moreActions",
-        "label": "More Actions...",
-        "icon": "$(ellipsis)"
+        "id": "githubLocalActions.helpAndSupport",
+        "label": "Help and Support",
+        "icon": "$(question)"
       }
     ],
     "menus": {
@@ -339,7 +339,7 @@
           "when": "never"
         },
         {
-          "command": "githubLocalActions.helpAndSupport",
+          "command": "githubLocalActions.reportAnIssue",
           "when": "never"
         }
       ],
@@ -380,18 +380,18 @@
           "group": "navigation@0"
         },
         {
-          "submenu": "githubLocalActions.moreActions",
+          "submenu": "githubLocalActions.helpAndSupport",
           "when": "view =~ /^(components|workflows|history|settings)$/",
           "group": "navigation@99"
         }
       ],
-      "githubLocalActions.moreActions": [
+      "githubLocalActions.helpAndSupport": [
         {
           "command": "githubLocalActions.viewDocumentation",
           "group": "0_more@0"
         },
         {
-          "command": "githubLocalActions.helpAndSupport",
+          "command": "githubLocalActions.reportAnIssue",
           "group": "0_more@1"
         }
       ],
diff --git a/src/extension.ts b/src/extension.ts
index b785fdd..01644a1 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -23,13 +23,13 @@ export function activate(context: vscode.ExtensionContext) {
 	// Create tree views
 	const decorationProvider = new DecorationProvider();
 	componentsTreeDataProvider = new ComponentsTreeDataProvider(context);
-	const componentsTreeView = window.createTreeView(ComponentsTreeDataProvider.VIEW_ID, { treeDataProvider: componentsTreeDataProvider });
+	const componentsTreeView = window.createTreeView(ComponentsTreeDataProvider.VIEW_ID, { treeDataProvider: componentsTreeDataProvider, showCollapseAll: true });
 	workflowsTreeDataProvider = new WorkflowsTreeDataProvider(context);
-	const workflowsTreeView = window.createTreeView(WorkflowsTreeDataProvider.VIEW_ID, { treeDataProvider: workflowsTreeDataProvider });
+	const workflowsTreeView = window.createTreeView(WorkflowsTreeDataProvider.VIEW_ID, { treeDataProvider: workflowsTreeDataProvider, showCollapseAll: true });
 	historyTreeDataProvider = new HistoryTreeDataProvider(context);
-	const historyTreeView = window.createTreeView(HistoryTreeDataProvider.VIEW_ID, { treeDataProvider: historyTreeDataProvider });
+	const historyTreeView = window.createTreeView(HistoryTreeDataProvider.VIEW_ID, { treeDataProvider: historyTreeDataProvider, showCollapseAll: true });
 	settingsTreeDataProvider = new SettingsTreeDataProvider(context);
-	const settingsTreeView = window.createTreeView(SettingsTreeDataProvider.VIEW_ID, { treeDataProvider: settingsTreeDataProvider });
+	const settingsTreeView = window.createTreeView(SettingsTreeDataProvider.VIEW_ID, { treeDataProvider: settingsTreeDataProvider, showCollapseAll: true });
 	settingsTreeView.onDidChangeCheckboxState(async (event: TreeCheckboxChangeEvent<GithubLocalActionsTreeItem>) => {
 		await settingsTreeDataProvider.onDidChangeCheckboxState(event as TreeCheckboxChangeEvent<SettingTreeItem>);
 	});
@@ -59,7 +59,7 @@ export function activate(context: vscode.ExtensionContext) {
 		commands.registerCommand('githubLocalActions.viewDocumentation', async () => {
 			await env.openExternal(Uri.parse('https://nektosact.com'));
 		}),
-		commands.registerCommand('githubLocalActions.helpAndSupport', async () => {
+		commands.registerCommand('githubLocalActions.reportAnIssue', async () => {
 			await env.openExternal(Uri.parse('https://github.com/SanjulaGanepola/github-local-actions/issues'));
 		}),
 	);