diff --git a/app/src/main/assets/layouts/number_row/number_row.txt b/app/src/main/assets/layouts/number_row/number_row.txt
index a7fed81c6..84dbed0a4 100644
--- a/app/src/main/assets/layouts/number_row/number_row.txt
+++ b/app/src/main/assets/layouts/number_row/number_row.txt
@@ -1,10 +1,124 @@
-1 ¹ ½ ⅓ ¼ ⅛
-2 ² ⅔
-3 ³ ¾ ⅜
-4 ⁴
-5 ⁵ ⅝
-6 ⁶
-7 ⁷ ⅞
-8 ⁸
-9 ⁹
-0 ⁰ ⁿ ∅
+[
+  [
+    {
+      "$": "shift_state_selector",
+      "manualOrLocked": { "label": "!" },
+      "default": { 
+        "label": "1", 
+        "popup": { 
+          "relevant": [ 
+            { "label": "¹" }, { "label": "½" }, { "label": "⅓" }, { "label": "¼" }, { "label": "⅛" } 
+          ] 
+        } 
+      } 
+    },
+    {
+      "$": "shift_state_selector",
+      "manualOrLocked": { "label": "@" },
+      "default": { 
+        "label": "2", 
+        "popup": { 
+          "relevant": [ 
+            { "label": "²" }, { "label": "⅔" } 
+          ] 
+        } 
+      } 
+    },
+    {
+      "$": "shift_state_selector",
+      "manualOrLocked": { "label": "#" },
+      "default": { 
+        "label": "3", 
+        "popup": { 
+          "relevant": [ 
+            { "label": "³" }, { "label": "¾" }, { "label": "⅜" } 
+          ] 
+        } 
+      } 
+    },
+    {
+      "$": "shift_state_selector",
+      "manualOrLocked": { "label": "$" },
+      "default": { 
+        "label": "4", 
+        "popup": { 
+          "relevant": [ 
+            { "label": "⁴" } 
+          ] 
+        } 
+      } 
+    },
+    {
+      "$": "shift_state_selector",
+      "manualOrLocked": { "label": "%" },
+      "default": { 
+        "label": "5", 
+        "popup": { 
+          "relevant": [ 
+            { "label": "⁵" }, { "label": "⅝" } 
+          ] 
+        } 
+      } 
+    },
+    {
+      "$": "shift_state_selector",
+      "manualOrLocked": { "label": "^" },
+      "default": { 
+        "label": "6", 
+        "popup": { 
+          "relevant": [ 
+            { "label": "⁶" } 
+          ] 
+        } 
+      } 
+    },
+    {
+      "$": "shift_state_selector",
+      "manualOrLocked": { "label": "&" },
+      "default": { 
+        "label": "7", 
+        "popup": { 
+          "relevant": [ 
+            { "label": "⁷" }, { "label": "⅞" } 
+          ] 
+        } 
+      } 
+    },
+    {
+      "$": "shift_state_selector",
+      "manualOrLocked": { "label": "*" },
+      "default": { 
+        "label": "8", 
+        "popup": { 
+          "relevant": [ 
+            { "label": "⁸" } 
+          ] 
+        } 
+      } 
+    },
+    {
+      "$": "shift_state_selector",
+      "manualOrLocked": { "label": "(" },
+      "default": { 
+        "label": "9", 
+        "popup": { 
+          "relevant": [ 
+            { "label": "⁹" } 
+          ] 
+        } 
+      } 
+    },
+    {
+      "$": "shift_state_selector",
+      "manualOrLocked": { "label": ")" },
+      "default": { 
+        "label": "0", 
+        "popup": { 
+          "relevant": [ 
+            { "label": "⁰" }, { "label": "ⁿ" }, { "label": "∅" } 
+          ] 
+        } 
+      } 
+    }
+  ]
+]