diff --git a/src/ui/components/NodeList/NodeRow.css b/src/ui/components/NodeList/NodeRow.css
index b9dafa9..cbca5bc 100644
--- a/src/ui/components/NodeList/NodeRow.css
+++ b/src/ui/components/NodeList/NodeRow.css
@@ -36,6 +36,11 @@
   grid-column: 1 / span 2;
 }
 
+.ns {
+  cursor: unset;
+  grid-column: 1 / span 2;
+}
+
 .disabled {
   color: var(--figma-color-text-disabled);
 }
diff --git a/src/ui/components/NodeList/NodeRow.css.d.ts b/src/ui/components/NodeList/NodeRow.css.d.ts
index 188fd69..eee1ece 100644
--- a/src/ui/components/NodeList/NodeRow.css.d.ts
+++ b/src/ui/components/NodeList/NodeRow.css.d.ts
@@ -3,6 +3,7 @@ declare const styles: {
   readonly "container": string;
   readonly "disabled": string;
   readonly "key": string;
+  readonly "ns": string;
   readonly "text": string;
 };
 export = styles;
diff --git a/src/ui/components/NodeList/NodeRow.tsx b/src/ui/components/NodeList/NodeRow.tsx
index 46eb383..ae6dd0e 100644
--- a/src/ui/components/NodeList/NodeRow.tsx
+++ b/src/ui/components/NodeList/NodeRow.tsx
@@ -77,6 +77,7 @@ export const NodeRow = ({
         {keyComponent ? keyComponent : node.key}
       </div>
       <div
+        className={styles.ns}
         title="Translation namespace"
         data-cy="general_node_list_row_namespace"
       >
diff --git a/src/ui/views/Index/Index.tsx b/src/ui/views/Index/Index.tsx
index 7c74bbf..1ed4447 100644
--- a/src/ui/views/Index/Index.tsx
+++ b/src/ui/views/Index/Index.tsx
@@ -114,64 +114,66 @@ export const Index = () => {
           space="medium"
           style={{ paddingBlock: "var(--space-extra-small)" }}
         >
-          {editorMode.data !== "dev" && (
-            <TopBar
-              leftPart={
-                <Fragment>
-                  {languages && (
-                    <select
-                      data-cy="index_language_select"
-                      className={styles.languageContainer}
-                      value={language}
-                      onChange={(e) => {
-                        handleLanguageChange(
-                          (e.target as HTMLInputElement).value
-                        );
-                      }}
-                    >
-                      {languages.map((l) => (
-                        <option key={l.tag} value={l.tag}>
-                          {l.name}
-                        </option>
-                      ))}
-                    </select>
-                  )}
-
-                  <Button data-cy="index_push_button" onClick={handlePush}>
-                    {nothingSelected ? "Push all" : "Push"}
-                  </Button>
-
-                  <Button
-                    data-cy="index_pull_button"
-                    onClick={handlePull}
-                    secondary
+          <TopBar
+            leftPart={
+              <Fragment>
+                {languages && editorMode.data !== "dev" && (
+                  <select
+                    data-cy="index_language_select"
+                    className={styles.languageContainer}
+                    value={language}
+                    onChange={(e) => {
+                      handleLanguageChange(
+                        (e.target as HTMLInputElement).value
+                      );
+                    }}
                   >
-                    {nothingSelected ? "Pull all" : "Pull"}
-                  </Button>
+                    {languages.map((l) => (
+                      <option key={l.tag} value={l.tag}>
+                        {l.name}
+                      </option>
+                    ))}
+                  </select>
+                )}
+
+                <Button data-cy="index_push_button" onClick={handlePush}>
+                  {nothingSelected ? "Push all" : "Push"}
+                </Button>
+
+                {editorMode.data !== "dev" && (
+                  <Fragment>
+                    <Button
+                      data-cy="index_pull_button"
+                      onClick={handlePull}
+                      secondary
+                    >
+                      {nothingSelected ? "Pull all" : "Pull"}
+                    </Button>
 
-                  <Button
-                    data-cy="index_create_copy_button"
-                    onClick={handleCopy}
-                    secondary
-                  >
-                    Create a copy
-                  </Button>
-                </Fragment>
-              }
-              rightPart={
-                <div style={{ display: "flex", alignItems: "center", gap: 8 }}>
-                  <div
-                    data-cy="index_settings_button"
-                    className={styles.settingsButton}
-                    onClick={() => setRoute("settings")}
-                    role="button"
-                  >
-                    <Settings width={15} height={15} />
-                  </div>
+                    <Button
+                      data-cy="index_create_copy_button"
+                      onClick={handleCopy}
+                      secondary
+                    >
+                      Copy
+                    </Button>
+                  </Fragment>
+                )}
+              </Fragment>
+            }
+            rightPart={
+              <div style={{ display: "flex", alignItems: "center", gap: 8 }}>
+                <div
+                  data-cy="index_settings_button"
+                  className={styles.settingsButton}
+                  onClick={() => setRoute("settings")}
+                  role="button"
+                >
+                  <Settings width={15} height={15} />
                 </div>
-              }
-            />
-          )}
+              </div>
+            }
+          />
         </Container>
         <Divider />
         <Container space="medium">
@@ -200,11 +202,7 @@ export const Index = () => {
         </Container>
       ) : (
         <NodeList
-          items={
-            editorMode.data !== "dev"
-              ? selection
-              : selection.filter((n) => n.connected)
-          }
+          items={selection}
           row={(node) => (
             <ListItem
               node={node}
diff --git a/src/ui/views/Push/Changes.tsx b/src/ui/views/Push/Changes.tsx
index 65e601f..05c910f 100644
--- a/src/ui/views/Push/Changes.tsx
+++ b/src/ui/views/Push/Changes.tsx
@@ -25,6 +25,7 @@ export const Changes = ({ changes }: Props) => {
             data-cy="changes_new_keys"
           >
             <NodeList
+              rowHeight={28}
               items={changes.newKeys.map((k) => ({
                 id: k.key,
                 key: k.key,
@@ -47,6 +48,7 @@ export const Changes = ({ changes }: Props) => {
             data-cy="changes_changed_keys"
           >
             <NodeList
+              rowHeight={28}
               items={changes.changedKeys.map((k) => ({
                 id: k.key,
                 key: k.key,
diff --git a/src/ui/views/Router.tsx b/src/ui/views/Router.tsx
index 2e1cfda..ecc83fe 100644
--- a/src/ui/views/Router.tsx
+++ b/src/ui/views/Router.tsx
@@ -14,6 +14,7 @@ import { CopyView } from "./CopyView/CopyView";
 import { Dialog } from "../components/Dialog/Dialog";
 import { StringDetails } from "./StringDetails/StringDetails";
 import { ResizeHandle } from "../components/ResizeHandle/ResizeHandle";
+import { useEditorMode } from "../hooks/useEditorMode";
 
 const getDialogPage = ([routeKey, routeData]: Route) => {
   switch (routeKey) {
@@ -68,6 +69,7 @@ export const Router = () => {
   const pageStringDetails = useGlobalState((c) => c.config?.pageStringDetails);
   const pageStringDetailsNodeInfo = useGlobalState((c) => c.config?.nodeInfo);
   const { setRoute } = useGlobalActions();
+  const editorMode = useEditorMode();
 
   const forceSettings = !pageCopy && !documentInfo;
   const errorOnTop = !forceSettings && routeKey !== "settings";
@@ -98,7 +100,7 @@ export const Router = () => {
       ) : (
         <Page route={route} setRoute={setRoute} />
       )}
-      <ResizeHandle />
+      {editorMode.data !== "dev" && <ResizeHandle />}
     </Fragment>
   );
 };