diff --git a/backend/windmill-common/src/ee.rs b/backend/windmill-common/src/ee.rs
index 51ad62a8a9..d3ffd98584 100644
--- a/backend/windmill-common/src/ee.rs
+++ b/backend/windmill-common/src/ee.rs
@@ -1,5 +1,5 @@
 use crate::ee::LicensePlan::Community;
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 use std::sync::Arc;
 use tokio::sync::RwLock;
 
@@ -20,9 +20,8 @@ pub async fn get_license_plan() -> LicensePlan {
     return Community;
 }
 
-#[derive(Serialize, Deserialize)]
+#[derive(Deserialize)]
+#[serde(untagged)]
 pub enum CriticalErrorChannel {}
 
-pub async fn trigger_critical_error_channels(_msg: String) {
-    // Implementation is not open source
-}
+pub async fn trigger_critical_error_channels(_error_message: String) {}
diff --git a/frontend/src/lib/components/apps/components/buttons/AppButton.svelte b/frontend/src/lib/components/apps/components/buttons/AppButton.svelte
index 9e741e7b35..69325d2bff 100644
--- a/frontend/src/lib/components/apps/components/buttons/AppButton.svelte
+++ b/frontend/src/lib/components/apps/components/buttons/AppButton.svelte
@@ -192,7 +192,6 @@
 		if (iterContext && listInputs) {
 			listInputs.set(id, inputOutput)
 		}
-		console.log('success', r)
 	}}
 	refreshOnStart={resolvedConfig.triggerOnAppLoad}
 >
diff --git a/frontend/src/lib/components/apps/components/display/table/AppAggridExplorerTable.svelte b/frontend/src/lib/components/apps/components/display/table/AppAggridExplorerTable.svelte
index 456c338985..94815cebc8 100644
--- a/frontend/src/lib/components/apps/components/display/table/AppAggridExplorerTable.svelte
+++ b/frontend/src/lib/components/apps/components/display/table/AppAggridExplorerTable.svelte
@@ -129,7 +129,10 @@
 				row,
 				render: true,
 				wrapActions: resolvedConfig.wrapActions,
-
+				selectRow: () => {
+					toggleRow(p)
+					p.node.setSelected(true)
+				},
 				onSet: (id, value) => {
 					if (!inputs[id]) {
 						inputs[id] = { [rowIndex]: value }
diff --git a/frontend/src/lib/components/apps/components/display/table/AppAggridTable.svelte b/frontend/src/lib/components/apps/components/display/table/AppAggridTable.svelte
index 0f3d3d5be4..58e7b02bdd 100644
--- a/frontend/src/lib/components/apps/components/display/table/AppAggridTable.svelte
+++ b/frontend/src/lib/components/apps/components/display/table/AppAggridTable.svelte
@@ -205,6 +205,10 @@
 				row,
 				render,
 				wrapActions: resolvedConfig.wrapActions,
+				selectRow: () => {
+					toggleRow(p)
+					p.node.setSelected(true)
+				},
 				onSet: (id, value) => {
 					if (!inputs[id]) {
 						inputs[id] = { [rowIndex]: value }
diff --git a/frontend/src/lib/components/apps/components/display/table/AppAggridTableActions.svelte b/frontend/src/lib/components/apps/components/display/table/AppAggridTableActions.svelte
index 459621df5b..8174632a75 100644
--- a/frontend/src/lib/components/apps/components/display/table/AppAggridTableActions.svelte
+++ b/frontend/src/lib/components/apps/components/display/table/AppAggridTableActions.svelte
@@ -23,6 +23,7 @@
 	export let onSet: (id: string, value: any) => void
 	export let onRemove: (id: string) => void
 	export let wrapActions: boolean | undefined = undefined
+	export let selectRow: () => void
 
 	const dispatch = createEventDispatcher()
 	const { selectedComponent, hoverStore, mode, connectingInput } =
@@ -51,7 +52,8 @@
 						$hoverStore = undefined
 					}
 				}}
-				on:pointerdown|stopPropagation={() => {
+				on:pointerdown|stopPropagation={(e) => {
+					selectRow()
 					$selectedComponent = [action.id]
 				}}
 				class={twMerge(
@@ -135,6 +137,7 @@
 							noWFull
 							preclickAction={async () => {
 								dispatch('toggleRow')
+								selectRow()
 							}}
 							id={action.id}
 							customCss={action.customCss}
@@ -159,6 +162,7 @@
 							onToggle={action.onToggle}
 							preclickAction={async () => {
 								dispatch('toggleRow')
+								selectRow()
 							}}
 							verticalAlignment="center"
 							{controls}
@@ -178,6 +182,7 @@
 								onSelect={action.onSelect}
 								preclickAction={async () => {
 									dispatch('toggleRow')
+									selectRow()
 								}}
 								{controls}
 							/>
@@ -190,6 +195,7 @@
 						{render}
 						preclickAction={async () => {
 							dispatch('toggleRow')
+							selectRow()
 						}}
 						noWFull
 						id={action.id}
@@ -213,6 +219,7 @@
 						onToggle={action.onToggle}
 						preclickAction={async () => {
 							dispatch('toggleRow')
+							selectRow()
 						}}
 					/>
 				{:else if action.type == 'selectcomponent'}
@@ -230,6 +237,7 @@
 							onSelect={action.onSelect}
 							preclickAction={async () => {
 								dispatch('toggleRow')
+								selectRow()
 							}}
 						/>
 					</div>
diff --git a/frontend/src/routes/(root)/(logged)/+layout.svelte b/frontend/src/routes/(root)/(logged)/+layout.svelte
index 2dd734fc24..e39c9b4dd0 100644
--- a/frontend/src/routes/(root)/(logged)/+layout.svelte
+++ b/frontend/src/routes/(root)/(logged)/+layout.svelte
@@ -263,128 +263,131 @@
 	<div>
 		{#if !menuHidden}
 			{#if !$userStore?.operator}
-				<div
-					class={classNames(
-						'relative md:hidden',
-						menuOpen ? 'z-40' : 'pointer-events-none',
-						devOnly ? 'hidden' : ''
-					)}
-					role="dialog"
-					aria-modal="true"
-				>
+				{#if innerWidth < 768}
 					<div
 						class={classNames(
-							'fixed inset-0 dark:bg-[#1e232e] bg-[#202125] dark:bg-opacity-75 bg-opacity-75 transition-opacity ease-linear duration-300 z-40 !dark',
-
-							menuOpen ? 'opacity-100' : 'opacity-0'
+							'relative',
+							menuOpen ? 'z-40' : 'pointer-events-none',
+							devOnly ? 'hidden' : ''
 						)}
-					/>
-
-					<div class="fixed inset-0 flex z-40">
+						role="dialog"
+						aria-modal="true"
+					>
 						<div
 							class={classNames(
-								'relative flex-1 flex flex-col max-w-min w-full bg-surface transition ease-in-out duration-300 transform',
-								menuOpen ? 'translate-x-0' : '-translate-x-full'
+								'fixed inset-0 dark:bg-[#1e232e] bg-[#202125] dark:bg-opacity-75 bg-opacity-75 transition-opacity ease-linear duration-300 z-40 !dark',
+
+								menuOpen ? 'opacity-100' : 'opacity-0'
 							)}
-						>
+						/>
+
+						<div class="fixed inset-0 flex z-40">
 							<div
 								class={classNames(
-									'absolute top-0 right-0 -mr-12 pt-2 ease-in-out duration-300',
-									menuOpen ? 'opacity-100' : 'opacity-0'
+									'relative flex-1 flex flex-col max-w-min w-full bg-surface transition ease-in-out duration-300 transform',
+									menuOpen ? 'translate-x-0' : '-translate-x-full'
 								)}
 							>
-								<button
-									type="button"
-									on:click={() => {
-										menuOpen = !menuOpen
-									}}
-									class="ml-1 flex items-center justify-center h-8 w-8 rounded-full focus:outline-none focus:ring-2 focus:ring-inset focus:ring-white border border-white"
-								>
-									<svg
-										class="h-6 w-6 text-white"
-										xmlns="http://www.w3.org/2000/svg"
-										fill="none"
-										viewBox="0 0 24 24"
-										stroke-width="2"
-										stroke="currentColor"
-										aria-hidden="true"
-									>
-										<path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
-									</svg>
-								</button>
-							</div>
-							<div class="dark:bg-[#1e232e] bg-[#202125] h-full !dark">
 								<div
-									class="flex gap-x-2 flex-shrink-0 p-4 font-semibold text-gray-200 w-10"
-									class:w-40={!isCollapsed}
+									class={classNames(
+										'absolute top-0 right-0 -mr-12 pt-2 ease-in-out duration-300',
+										menuOpen ? 'opacity-100' : 'opacity-0'
+									)}
 								>
-									<WindmillIcon white={true} height="20px" width="20px" />
-									{#if !isCollapsed}Windmill{/if}
+									<button
+										type="button"
+										on:click={() => {
+											menuOpen = !menuOpen
+										}}
+										class="ml-1 flex items-center justify-center h-8 w-8 rounded-full focus:outline-none focus:ring-2 focus:ring-inset focus:ring-white border border-white"
+									>
+										<svg
+											class="h-6 w-6 text-white"
+											xmlns="http://www.w3.org/2000/svg"
+											fill="none"
+											viewBox="0 0 24 24"
+											stroke-width="2"
+											stroke="currentColor"
+											aria-hidden="true"
+										>
+											<path
+												stroke-linecap="round"
+												stroke-linejoin="round"
+												d="M6 18L18 6M6 6l12 12"
+											/>
+										</svg>
+									</button>
 								</div>
+								<div class="dark:bg-[#1e232e] bg-[#202125] h-full !dark">
+									<div class="flex gap-x-2 flex-shrink-0 p-4 font-semibold text-gray-200 w-40">
+										<WindmillIcon white={true} height="20px" width="20px" />
+										Windmill
+									</div>
 
-								<div class="px-2 py-4 space-y-2 border-y border-gray-500">
-									<WorkspaceMenu />
-									<FavoriteMenu {favoriteLinks} />
+									<div class="px-2 py-4 space-y-2 border-y border-gray-500">
+										<WorkspaceMenu />
+										<FavoriteMenu {favoriteLinks} />
+									</div>
+
+									<SidebarContent isCollapsed={false} />
 								</div>
-
-								<SidebarContent {isCollapsed} />
 							</div>
 						</div>
 					</div>
-				</div>
-
-				<div
-					id="sidebar"
-					class={classNames(
-						'hidden md:flex md:flex-col md:fixed md:inset-y-0 transition-all ease-in-out duration-200 shadow-md z-40 ',
-						isCollapsed ? 'md:w-12' : 'md:w-40',
-						devOnly ? '!hidden' : ''
-					)}
-				>
+				{:else}
 					<div
-						class="flex-1 flex flex-col min-h-0 h-screen shadow-lg dark:bg-[#1e232e] bg-[#202125] !dark"
+						id="sidebar"
+						class={classNames(
+							'flex flex-col fixed inset-y-0 transition-all ease-in-out duration-200 shadow-md z-40 ',
+							isCollapsed ? 'md:w-12' : 'md:w-40',
+							devOnly ? '!hidden' : ''
+						)}
 					>
-						<button
-							on:click={() => {
-								goto('/')
-							}}
+						<div
+							class="flex-1 flex flex-col min-h-0 h-screen shadow-lg dark:bg-[#1e232e] bg-[#202125] !dark"
 						>
-							<div
-								class="flex-row flex-shrink-0 px-3.5 py-3.5 text-opacity-70 h-12 flex items-center gap-1.5"
-								class:w-40={!isCollapsed}
-							>
-								<div class:mr-1={!isCollapsed}>
-									<WindmillIcon white={true} height="20px" width="20px" />
-								</div>
-								{#if !isCollapsed}
-									<div class="text-sm mt-0.5 text-white"> Windmill </div>
-								{/if}
-							</div>
-						</button>
-						<div class="px-2 py-4 space-y-2 border-y border-gray-700">
-							<WorkspaceMenu {isCollapsed} />
-							<FavoriteMenu {favoriteLinks} {isCollapsed} />
-						</div>
-
-						<SidebarContent {isCollapsed} />
-
-						<div class="flex-shrink-0 flex px-4 pb-3.5">
 							<button
 								on:click={() => {
-									isCollapsed = !isCollapsed
+									goto('/')
 								}}
 							>
-								<ArrowLeft
-									size={16}
-									class={classNames(
-										'flex-shrink-0 h-4 w-4 transition-all ease-in-out duration-200 text-white',
-										isCollapsed ? 'rotate-180' : 'rotate-0'
-									)}
-								/>
+								<div
+									class="flex-row flex-shrink-0 px-3.5 py-3.5 text-opacity-70 h-12 flex items-center gap-1.5"
+									class:w-40={!isCollapsed}
+								>
+									<div class:mr-1={!isCollapsed}>
+										<WindmillIcon white={true} height="20px" width="20px" />
+									</div>
+									{#if !isCollapsed}
+										<div class="text-sm mt-0.5 text-white"> Windmill </div>
+									{/if}
+								</div>
 							</button>
+							<div class="px-2 py-4 space-y-2 border-y border-gray-700">
+								<WorkspaceMenu {isCollapsed} />
+								<FavoriteMenu {favoriteLinks} {isCollapsed} />
+							</div>
+
+							<SidebarContent {isCollapsed} />
+
+							<div class="flex-shrink-0 flex px-4 pb-3.5">
+								<button
+									on:click={() => {
+										isCollapsed = !isCollapsed
+									}}
+								>
+									<ArrowLeft
+										size={16}
+										class={classNames(
+											'flex-shrink-0 h-4 w-4 transition-all ease-in-out duration-200 text-white',
+											isCollapsed ? 'rotate-180' : 'rotate-0'
+										)}
+									/>
+								</button>
+							</div>
 						</div>
 					</div>
-				</div>
+				{/if}
 			{:else}
 				<div class="absolute top-2 left-2 z5000">
 					<OperatorMenu {favoriteLinks} />