diff --git a/apps/canvas/front/src/Gateways.tsx b/apps/canvas/front/src/Gateways.tsx
index 92a30a2..3612a95 100644
--- a/apps/canvas/front/src/Gateways.tsx
+++ b/apps/canvas/front/src/Gateways.tsx
@@ -65,12 +65,12 @@
 		<TooltipProvider>
 			<Tooltip delayDuration={100} open={open} onOpenChange={setOpen}>
 				<TooltipTrigger asChild>
-					<Button variant="ghost" onClick={copy}>
+					<Button variant="ghost" onClick={copy} className="!gap-1 !p-0 !h-fit">
 						<AccessType type={g.type} className="w-4 h-4" />
 						<div className="hover:bg-gray-200 p-x-1">{hidden}</div>
 					</Button>
 				</TooltipTrigger>
-				<TooltipContent side="right" className="!bg-transparent cursor-pointer !p-0" sideOffset={1}>
+				<TooltipContent side="right" className="!bg-transparent cursor-pointer !p-0" sideOffset={10}>
 					{!clicked && <Copy className="w-4 h-4 !bg-transparent" color="black" />}
 					{clicked && <Check className="w-4 h-4 !bg-transparent" color="black" />}
 				</TooltipContent>
diff --git a/apps/canvas/front/src/Tools.tsx b/apps/canvas/front/src/Tools.tsx
index c185d45..f355d3e 100644
--- a/apps/canvas/front/src/Tools.tsx
+++ b/apps/canvas/front/src/Tools.tsx
@@ -14,7 +14,10 @@
 					<div>Messages</div>
 					<Badge>{messages.length}</Badge>
 				</TabsTrigger>
-				<TabsTrigger value="gateways">Gateways</TabsTrigger>
+				<TabsTrigger value="gateways" className="space-x-2">
+					<div>Gateways</div>
+					<Badge>{env.access.length}</Badge>
+				</TabsTrigger>
 				<TabsTrigger value="deployKeys">Deploy keys</TabsTrigger>
 			</TabsList>
 			<div className="!overflow-y-auto p-1">
@@ -24,7 +27,7 @@
 				<TabsContent value="gateways">
 					<Gateways />
 				</TabsContent>
-				<TabsContent value="deployKeys">{env && <>{env.deployKey}</>}</TabsContent>
+				<TabsContent value="deployKeys">{env.deployKey && <>{env.deployKey}</>}</TabsContent>
 			</div>
 		</Tabs>
 	);