diff --git a/src/codec-components/EditCodec/Tree/codec-components.tsx b/src/codec-components/EditCodec/Tree/codec-components.tsx
index 1d16186..c5e7fc6 100644
--- a/src/codec-components/EditCodec/Tree/codec-components.tsx
+++ b/src/codec-components/EditCodec/Tree/codec-components.tsx
@@ -181,7 +181,7 @@ export const ItemTitle: FC<
           ref={titleRef}
           className="flex flex-1 ml-1 flex-wrap leading-none"
         />
-        <div className="visible_when_parent_hover px-1 flex gap-1.5 items-center">
+        <div className="visible_when_parent_hover px-1 flex gap-1.5 items-center absolute right-0 bg-secondary">
           {onZoom && binaryStatus && (
             <BinaryEdit
               size={24}
diff --git a/src/pages/AppShell.tsx b/src/pages/AppShell.tsx
index a94db1c..7060ebc 100644
--- a/src/pages/AppShell.tsx
+++ b/src/pages/AppShell.tsx
@@ -168,12 +168,9 @@ const SidebarContent: FC<{ mobile?: boolean; onNavigate?: () => void }> = ({
         src="/papi_logo-light.svg"
         alt="papi logo"
       />
-      <div className="min-w-0 leading-tight">
-        <div className="truncate text-base">
-          <span className="poppins-regular">papi</span>{" "}
-          <span className="poppins-extralight">console</span>
-        </div>
-        <div className="text-xs text-muted-foreground">beta</div>
+      <div className="min-w-0 leading-tight truncate text-base">
+        <span className="poppins-regular">papi</span>{" "}
+        <span className="poppins-extralight">console</span>
       </div>
     </div>
     {mobile ? (
diff --git a/src/pages/Extrinsics/EditMode.tsx b/src/pages/Extrinsics/EditMode.tsx
index 6f45240..d70cbda 100644
--- a/src/pages/Extrinsics/EditMode.tsx
+++ b/src/pages/Extrinsics/EditMode.tsx
@@ -57,7 +57,7 @@ export const EditMode: React.FC<{
             <div
               ref={treeRef}
               className={cn(
-                "min-w-fit w-96 sticky top-0 pl-2 pb-16 leading-loose overflow-hidden text-sm",
+                "w-96 shrink-0 sticky top-0 pl-2 pb-16 leading-loose overflow-hidden text-sm",
                 treeViewBreak,
                 {
                   hidden: collapsed,
@@ -73,11 +73,9 @@ export const EditMode: React.FC<{
                 <VisibleWindow />
               </div>
             </div>
-            <div className="flex-1">
-              <div className="p-2">
-                <Marker id={[]} />
-                <EditCodec {...props} />
-              </div>
+            <div className="flex-1 p-2">
+              <Marker id={[]} />
+              <EditCodec {...props} />
             </div>
           </div>
         </MarkersContextProvider>
diff --git a/src/pages/Network/Network.tsx b/src/pages/Network/Network.tsx
index d9f5ee2..619f337 100644
--- a/src/pages/Network/Network.tsx
+++ b/src/pages/Network/Network.tsx
@@ -524,9 +524,10 @@ const getConnectionLabel = (
   selectedChain: SelectedChain,
   websocketStatus: StatusChange | null,
 ) => {
-  const { network, endpoint } = selectedChain
+  const { network, endpoint, withChopsticks } = selectedChain
   if (endpoint === LIGHT_CLIENT_ENDPOINT) return "Smoldot"
   if (endpoint === AUTO_RPC_ENDPOINT) {
+    if (withChopsticks) return null
     if (!websocketStatus) return <Spinner className="inline-block" />
 
     const isReady = "uri" in websocketStatus