diff --git a/frontend/src/lib/components/ArgInput.svelte b/frontend/src/lib/components/ArgInput.svelte
index 75c5f30d40..8fb31363a1 100644
--- a/frontend/src/lib/components/ArgInput.svelte
+++ b/frontend/src/lib/components/ArgInput.svelte
@@ -166,7 +166,7 @@
 			<FieldHeader {label} {required} {type} {contentEncoding} {format} {itemsType} />
 		{/if}
 		{#if editableSchema}
-			<div class="my-1 text-xs border-solid border border-gray-400 rounded p-2">
+			<div class="my-1 text-xs border-solid border border-gray-400">
 				<span
 					class="underline"
 					on:click={() => {
diff --git a/frontend/src/lib/components/apps/components/buttons/AppButton.svelte b/frontend/src/lib/components/apps/components/buttons/AppButton.svelte
index e6baabe438..5820ce1b57 100644
--- a/frontend/src/lib/components/apps/components/buttons/AppButton.svelte
+++ b/frontend/src/lib/components/apps/components/buttons/AppButton.svelte
@@ -105,7 +105,9 @@
 			{color}
 			{loading}
 		>
-			{labelValue}
+			<span class="truncate">
+				{labelValue}
+			</span>
 		</Button>
 	</AlignWrapper>
 </RunnableWrapper>
diff --git a/frontend/src/lib/components/apps/components/dataDisplay/AppText.svelte b/frontend/src/lib/components/apps/components/dataDisplay/AppText.svelte
index 013e776078..363131a023 100644
--- a/frontend/src/lib/components/apps/components/dataDisplay/AppText.svelte
+++ b/frontend/src/lib/components/apps/components/dataDisplay/AppText.svelte
@@ -67,8 +67,8 @@
 				No text
 			</div>
 		{:else}
-			<div class="flex flex-wrap gap-2 overflow-auto">
-				<svelte:element this={component} class="whitespace-pre-wrap {classes}" style={extraStyle}>
+			<div class="flex flex-wrap gap-2 pb-0.5 overflow-x-auto">
+				<svelte:element this={component} class="whitespace-pre-wrap  {classes}" style={extraStyle}>
 					{String(result)}
 				</svelte:element>
 				{#if copyButton && result}
diff --git a/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte b/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte
index 668940e995..b7335c270c 100644
--- a/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte
+++ b/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte
@@ -342,7 +342,7 @@
 			<slot />
 		</div>
 	{:else}
-		<div class="block grow max-h-full">
+		<div class="block grow w-full max-h-full">
 			<slot />
 		</div>
 	{/if}
diff --git a/frontend/src/lib/components/apps/editor/AppComponentInput.svelte b/frontend/src/lib/components/apps/editor/AppComponentInput.svelte
index 044250c2d2..9cf8962f8c 100644
--- a/frontend/src/lib/components/apps/editor/AppComponentInput.svelte
+++ b/frontend/src/lib/components/apps/editor/AppComponentInput.svelte
@@ -7,7 +7,7 @@
 </script>
 
 {#if component?.componentInput?.type === 'runnable' && Object.keys(component?.componentInput?.fields ?? {}).length > 0}
-	<div class="mb-8">
+	<div class="mb-8 border p-2">
 		<div class="flex justify-between mb-4">
 			<span class="text-sm font-bold">{component.id}</span>
 			<span class="text-sm font-bold">{components[component.type].name}</span>
@@ -21,7 +21,7 @@
 				}
 				return false
 			}).length === 0}
-			<span class="text-sm">No resource input</span>
+			<span class="text-sm text-gray-600">No resource input</span>
 		{:else}
 			<InputsSpecsEditor
 				id={component.id}
diff --git a/frontend/src/lib/components/apps/editor/AppEditor.svelte b/frontend/src/lib/components/apps/editor/AppEditor.svelte
index 3f2629687b..78400156b6 100644
--- a/frontend/src/lib/components/apps/editor/AppEditor.svelte
+++ b/frontend/src/lib/components/apps/editor/AppEditor.svelte
@@ -157,7 +157,7 @@
 										: 'max-w-6xl'}"
 								>
 									{#if $appStore.grid}
-										<div class={classNames('p-4 mx-auto', width)}>
+										<div class={classNames('pb-4 mx-auto', width)}>
 											<GridEditor {policy} />
 										</div>
 									{/if}
diff --git a/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte b/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte
index 883aeb3106..6422f73c15 100644
--- a/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte
+++ b/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte
@@ -458,7 +458,7 @@
 			</ToggleButtonGroup>
 		</div>
 	</div>
-	<div class="flex flex-row grow gap-2 justify-end items-center overflow-visible">
+	<div class="flex flex-row gap-2 justify-end items-center overflow-visible">
 		<Dropdown
 			placement="bottom-end"
 			btnClasses="!text-gray-700 !bg-transparent hover:!bg-gray-400/20 !p-[6px] hidden lg:block"
diff --git a/frontend/src/lib/components/apps/editor/AppInputs.svelte b/frontend/src/lib/components/apps/editor/AppInputs.svelte
index 2e87d93e1d..2478c25d52 100644
--- a/frontend/src/lib/components/apps/editor/AppInputs.svelte
+++ b/frontend/src/lib/components/apps/editor/AppInputs.svelte
@@ -14,43 +14,51 @@
 <Alert type="info" title="Configurations">
 	In order to properly configure the app, you need to fill in the inputs below.
 </Alert>
-<Toggle bind:checked={resourceOnly} options={{ right: 'Resource only' }} />
-{#each $lazyGrid as gridItem (gridItem.data.id)}
-	{#if gridItem.data.type === 'tablecomponent'}
+<div class="mt-2 flex flex-row-reverse">
+	<Toggle bind:checked={resourceOnly} options={{ right: 'Resource only' }} />
+</div>
+<div class="gap-4 flex flex-col pt-4">
+	{#each $lazyGrid as gridItem (gridItem.data.id)}
 		<div>
-			<AppComponentInput bind:component={gridItem.data} {resourceOnly} />
-			<div class="ml-4 mt-4">
-				{#each gridItem.data.actionButtons as actionButton (actionButton.id)}
-					<AppComponentInput bind:component={actionButton.data} {resourceOnly} />
-				{/each}
-			</div>
+			{#if gridItem.data.type === 'tablecomponent'}
+				<div>
+					<AppComponentInput bind:component={gridItem.data} {resourceOnly} />
+					<div class="ml-4 mt-4">
+						{#each gridItem.data.actionButtons as actionButton (actionButton.id)}
+							<AppComponentInput bind:component={actionButton.data} {resourceOnly} />
+						{/each}
+					</div>
+				</div>
+			{:else}
+				<AppComponentInput bind:component={gridItem.data} {resourceOnly} />
+			{/if}
 		</div>
-	{:else}
-		<AppComponentInput bind:component={gridItem.data} {resourceOnly} />
-	{/if}
-{/each}
+	{/each}
+</div>
 
 {#if $app?.hiddenInlineScripts?.length > 0}
-	<span class="font-bold text-sm">Background script inputs</span>
-	<div class="gap-4 flex flex-col">
+	<div class="font-bold text-lg">Background script inputs</div>
+	<div class="gap-4 flex flex-col pt-4">
 		{#each $app?.hiddenInlineScripts ?? [] as script, index (script.name)}
-			<span class="text-sm">{script.name}</span>
+			<div class="border p-2">
+				<div class="text-sm font-bold">{script.name}</div>
 
-			{#if resourceOnly && Object.keys(script.fields).filter((fieldKey) => {
-					const fields = script.fields
-					const field = fields[fieldKey]
-					return field.fieldType === 'object' && field.format?.startsWith('resource-')
-				}).length === 0}
-				<span class="text-sm">No resource input</span>
-			{:else}
-				<InputsSpecsEditor
-					id={`bg_${index}`}
-					shouldCapitalize={false}
-					bind:inputSpecs={script.fields}
-					userInputEnabled={false}
-					{resourceOnly}
-				/>
-			{/if}
+				{#if resourceOnly && Object.keys(script.fields).filter((fieldKey) => {
+						const fields = script.fields
+						const field = fields[fieldKey]
+						return field.fieldType === 'object' && field.format?.startsWith('resource-')
+					}).length === 0}
+					<span class="text-sm text-gray-600">No resource input</span>
+				{:else}
+					<InputsSpecsEditor
+						id={`bg_${index}`}
+						shouldCapitalize={false}
+						bind:inputSpecs={script.fields}
+						userInputEnabled={false}
+						{resourceOnly}
+					/>
+				{/if}
+			</div>
 		{/each}
 	</div>
 {/if}
diff --git a/frontend/src/lib/components/apps/editor/AppPreview.svelte b/frontend/src/lib/components/apps/editor/AppPreview.svelte
index 619a31a01f..72f39c3b7e 100644
--- a/frontend/src/lib/components/apps/editor/AppPreview.svelte
+++ b/frontend/src/lib/components/apps/editor/AppPreview.svelte
@@ -75,7 +75,7 @@
 	$: lockedClasses = isLocked ? '!max-h-[400px] overflow-hidden pointer-events-none' : ''
 </script>
 
-<div class="relative h-[calc(100vh-41px)] overflow-auto">
+<div class="relative">
 	<div
 		class="{$$props.class} {lockedClasses} h-full 
 	w-full {app.fullscreen ? '' : 'max-w-6xl'} mx-auto"
diff --git a/frontend/src/lib/components/apps/editor/GridEditor.svelte b/frontend/src/lib/components/apps/editor/GridEditor.svelte
index 5711ca9adc..5d14c2d2e9 100644
--- a/frontend/src/lib/components/apps/editor/GridEditor.svelte
+++ b/frontend/src/lib/components/apps/editor/GridEditor.svelte
@@ -116,11 +116,12 @@
 	})
 </script>
 
-<div class="pb-2 relative z-20">
+<div class="pb-2 relative w-full z-20">
 	<div
-		class="w-full flex justify-between border-b {$connectingInput?.opened
+		class="w-full sticky  top-0 flex justify-between border-l border-r border-b {$connectingInput?.opened
 			? ''
-			: 'bg-gray-50 '}px-4 py-2 items-center gap-4"
+			: 'bg-gray-50 '} px-4 py-2 items-center gap-4"
+		style="z-index: 1000;"
 	>
 		<h2 class="truncate">{$summary}</h2>
 		{#if !$connectingInput.opened}
@@ -131,7 +132,7 @@
 		>
 	</div>
 	<div
-		class="px-4 pt-4 {$connectingInput?.opened ? '' : ''}"
+		class="px-4 pt-4 overflow-auto {$connectingInput?.opened ? '' : ''}"
 		on:pointerdown={onpointerdown}
 		on:pointerleave={onpointerup}
 		on:pointerup={onpointerup}
diff --git a/frontend/src/lib/components/apps/editor/inlineScriptsPanel/EmptyInlineScript.svelte b/frontend/src/lib/components/apps/editor/inlineScriptsPanel/EmptyInlineScript.svelte
index ac52a0c338..3c8798ea74 100644
--- a/frontend/src/lib/components/apps/editor/inlineScriptsPanel/EmptyInlineScript.svelte
+++ b/frontend/src/lib/components/apps/editor/inlineScriptsPanel/EmptyInlineScript.svelte
@@ -56,7 +56,7 @@
 	const langs = ['deno', 'python3', 'go', 'bash'] as Script.language[]
 </script>
 
-<div class="flex flex-col p-4 gap-2 text-sm" in:fly={{ duration: 50 }}>
+<div class="flex flex-col px-4 py-2 gap-2 text-sm" in:fly={{ duration: 50 }}>
 	Please choose a language:
 	<div class="flex gap-2 flex-row flex-wrap">
 		{#each langs as lang}
diff --git a/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptsPanel.svelte b/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptsPanel.svelte
index 611abc09a6..063204c580 100644
--- a/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptsPanel.svelte
+++ b/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptsPanel.svelte
@@ -19,6 +19,9 @@
 			<InlineScriptsPanelList bind:selectedScriptComponentId />
 		</Pane>
 		<Pane size={75}>
+			{#if !selectedScriptComponentId}
+				<span class="p-2 text-sm text-gray-600">Select a script on the left panel</span>
+			{/if}
 			{#each $lazyGrid as gridComponent, index (index)}
 				{#if gridComponent.data.id === selectedScriptComponentId}
 					<InlineScriptEditorPanel
diff --git a/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptsPanelList.svelte b/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptsPanelList.svelte
index 3f3f827981..f169737f63 100644
--- a/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptsPanelList.svelte
+++ b/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptsPanelList.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
 	import { Badge, Button } from '$lib/components/common'
 	import { faPlus } from '@fortawesome/free-solid-svg-icons'
+	import { Plus } from 'lucide-svelte'
 	import { getContext } from 'svelte'
 	import type { AppEditorContext } from '../../types'
 	import { getAllScriptNames } from '../../utils'
@@ -61,6 +62,7 @@
 	}
 </script>
 
+<div class="mb-0 pb-0 pl-2 sticky top-0 bg-white border-b text-xs font-semibold">Runnables</div>
 <div bind:this={list} class="min-h-full flex flex-col gap-4">
 	<PanelSection title="Inline scripts" smallPadding>
 		<div class="flex flex-col gap-2 w-full">
@@ -105,7 +107,7 @@
 		</div>
 	</PanelSection>
 
-	<PanelSection title="Imported scripts" smallPadding>
+	<PanelSection title="Workspace/Hub" smallPadding>
 		<div class="flex flex-col gap-2 w-full">
 			{#if runnables.imported.length > 0}
 				<div class="flex gap-2 flex-col ">
@@ -122,7 +124,7 @@
 					{/each}
 				</div>
 			{:else}
-				<div class="text-sm text-gray-500">No items</div>
+				<div class="text-sm text-gray-500">No imported scripts/flows</div>
 			{/if}
 		</div>
 	</PanelSection>
@@ -134,8 +136,8 @@
 		smallPadding
 	>
 		<svelte:fragment slot="action">
-			<Button size="xs" color="dark" startIcon={{ icon: faPlus }} on:click={createBackgroundScript}>
-				Add
+			<Button size="xs" color="dark" variant="border" on:click={createBackgroundScript}
+				><Plus size={14} />
 			</Button>
 		</svelte:fragment>
 		<div class="flex flex-col gap-2 w-full">
diff --git a/frontend/src/lib/components/apps/editor/settingsPanel/common/PanelSection.svelte b/frontend/src/lib/components/apps/editor/settingsPanel/common/PanelSection.svelte
index 389beb93bb..60292a42bd 100644
--- a/frontend/src/lib/components/apps/editor/settingsPanel/common/PanelSection.svelte
+++ b/frontend/src/lib/components/apps/editor/settingsPanel/common/PanelSection.svelte
@@ -16,9 +16,11 @@
 		noPadding ? '' : smallPadding ? 'p-2' : 'p-4'
 	)}
 >
-	<div class="flex justify-between items-center w-full gap-1">
-		<div class="text-sm font-extrabold {titlePadding}">
-			{title}
+	<div class="flex justify-between flex-wrap items-center w-full gap-1">
+		<div class="text-sm inline-flex items-center font-extrabold {titlePadding}">
+			<span class="truncate">
+				{title}
+			</span>
 			{#if tooltip}
 				<Tooltip>
 					{tooltip}
diff --git a/frontend/src/lib/components/scriptEditor/LogPanel.svelte b/frontend/src/lib/components/scriptEditor/LogPanel.svelte
index a807145b96..571a7b4f92 100644
--- a/frontend/src/lib/components/scriptEditor/LogPanel.svelte
+++ b/frontend/src/lib/components/scriptEditor/LogPanel.svelte
@@ -97,7 +97,7 @@
 								{#if previewIsLoading}
 									<Loader2 class="animate-spin" />
 								{:else}
-									Test to see the result here'
+									Test to see the result here
 								{/if}
 							</div>
 						{/if}
diff --git a/frontend/src/routes/(root)/(logged)/apps/get/[...path]/+page.svelte b/frontend/src/routes/(root)/(logged)/apps/get/[...path]/+page.svelte
index 059485aec2..a9065c760d 100644
--- a/frontend/src/routes/(root)/(logged)/apps/get/[...path]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/apps/get/[...path]/+page.svelte
@@ -22,7 +22,7 @@
 </script>
 
 {#if app}
-	<div class="border rounded-md p-2 w-full">
+	<div class="w-full">
 		<AppPreview
 			context={{
 				email: $userStore?.email,
diff --git a/frontend/src/routes/(root)/(logged)/user/(user)/workspaces/+page.svelte b/frontend/src/routes/(root)/(logged)/user/(user)/workspaces/+page.svelte
index 379236be06..f19a53a5b4 100644
--- a/frontend/src/routes/(root)/(logged)/user/(user)/workspaces/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/user/(user)/workspaces/+page.svelte
@@ -65,6 +65,8 @@
 		}
 	}
 
+	$: adminsInstance = workspaces?.find((x) => x.id == 'admins')
+
 	onMount(() => {
 		loadInvites()
 		loadWorkspaces()
@@ -83,13 +85,25 @@
 	</h2>
 
 	{#if $superadmin}
-		<div class="flex flex-row-reverse pb-4">
+		<div class="flex flex-row-reverse pb-2">
 			<Toggle
 				bind:checked={list_all_as_super_admin}
-				options={{ right: 'List all as superadmin' }}
+				options={{ right: 'List all workspaces as superadmin' }}
 			/>
 		</div>
 	{/if}
+
+	{#if adminsInstance}
+		<Button
+			btnClasses="w-full mt-2 mb-4"
+			color="light"
+			size="sm"
+			href="/user/switch_to_admins{rd ? `?rd=${encodeURIComponent(rd)}` : ''}"
+			variant="border"
+			>Manage Windmill on the workspace for superadmins
+		</Button>
+	{/if}
+
 	{#if workspaces && $usersWorkspaceStore}
 		{#if workspaces.length == 0}
 			<p class="text-sm text-gray-600 mt-2">
@@ -97,7 +111,7 @@
 				workspace.
 			</p>
 		{/if}
-		{#each workspaces as workspace}
+		{#each workspaces.filter((x) => x.id != 'admins') as workspace}
 			<label class="block pb-2">
 				<button
 					class="block w-full mx-auto py-1 px-2 rounded-md border border-gray-300 
@@ -135,6 +149,7 @@
 			<Skeleton layout={[[2], 0.5]} />
 		{/each}
 	{/if}
+
 	<div class="flex flex-row-reverse  pt-4">
 		<Button
 			size="sm"