diff --git a/config/base.keymap b/config/base.keymap
index d1d14f6..77d6437 100644
--- a/config/base.keymap
+++ b/config/base.keymap
@@ -19,6 +19,8 @@
 #define PASTE LC(V)
 #define UNDO LC(Z)
 #define SLALL LC(A)
+#define FHOME LC(HOME)
+#define FEND LC(END)
 
 /* Key Position Groups */
 #define KEYS_L 0 1 2 3 4 10 11 12 13 14 20 21 22  // left-hand keys
@@ -61,6 +63,18 @@
             hold-trigger-on-release;
             global-quick-tap;
         };
+        home: home_ignoring_ctrl {
+            compatible = "zmk,behavior-mod-morph";
+            #binding-cells = <0>;
+            bindings = <&kp HOME>, <&kp HOME>;
+            mods = <(MOD_LCTL|MOD_RCTL)>;
+        };
+        end: end_ignoring_ctrl {
+            compatible = "zmk,behavior-mod-morph";
+            #binding-cells = <0>;
+            bindings = <&kp END>, <&kp END>;
+            mods = <(MOD_LCTL|MOD_RCTL)>;
+        };
     };
 
     conditional_layers {
@@ -113,8 +127,8 @@
         nav_layer {
             label = "Nav";
             bindings = <
-                &kp F1    &kp F2    &kp F3    &kp F4    &kp F5      &kp PG_UP &kp ESC   &kp UARW  &kp TAB   &kp HOME
-                &kp LGUI  &kp LALT  &kp LSHFT &kp LCTRL &kp UNDO    &kp PG_DN &kp LARW  &kp ENTER &kp RARW  &kp END
+                &kp F1    &kp F2    &kp F3    &kp F4    &kp F5      &kp FHOME &kp ESC   &kp UARW  &kp TAB   &home
+                &kp LGUI  &kp LALT  &kp LSHFT &kp LCTRL &kp UNDO    &kp FEND  &kp LARW  &kp ENTER &kp RARW  &end
                           &kp CUT   &kp COPY  &kp PASTE                       &kp BSPC  &kp DARW  &kp DEL
                                               &trans    &trans      &trans    &trans
             >;
diff --git a/images/keymap.svg b/images/keymap.svg
index d9fe02e..396c2b8 100644
--- a/images/keymap.svg
+++ b/images/keymap.svg
@@ -82,6 +82,10 @@ text.shifted {
     dominant-baseline: hanging;
 }
 
+text.layer-activator {
+    text-decoration: underline;
+}
+
 /* styling for hold/shifted label text in combo box */
 text.combo.hold, text.combo.shifted {
     font-size: 8px;
@@ -124,7 +128,7 @@ path.combo { stroke: #7f7f7f; }
 
 }</style>
 <g transform="translate(30, 0)" class="layer-base">
-<text x="0" y="28" class="label">base:</text>
+<text x="0" y="28" class="label" id="base">base:</text>
 <g transform="translate(0, 56)">
 <g transform="translate(30, 56)" class="key keypos-0">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key"/>
@@ -232,8 +236,9 @@ path.combo { stroke: #7f7f7f; }
 </g>
 <g transform="translate(210, 196)" class="key keypos-26">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key"/>
-<text x="0" y="0" class="key tap">nav</text>
-</g>
+<a href="#nav">
+<text x="0" y="0" class="key tap layer-activator">nav</text>
+</a></g>
 <g transform="translate(270, 196)" class="key keypos-27">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key"/>
 <text x="0" y="0" class="key tap">space</text>
@@ -244,8 +249,9 @@ path.combo { stroke: #7f7f7f; }
 </g>
 <g transform="translate(420, 196)" class="key keypos-29">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key"/>
-<text x="0" y="0" class="key tap">sym</text>
-</g>
+<a href="#sym">
+<text x="0" y="0" class="key tap layer-activator">sym</text>
+</a></g>
 <g class="combo combopos-0">
 <rect rx="6" ry="6" x="106" y="15" width="28" height="26" class="combo"/>
 <text x="120" y="28" class="combo tap">v</text>
@@ -261,7 +267,7 @@ path.combo { stroke: #7f7f7f; }
 </g>
 </g>
 <g transform="translate(720, 0)" class="layer-nav">
-<text x="0" y="28" class="label">nav:</text>
+<text x="0" y="28" class="label" id="nav">nav:</text>
 <g transform="translate(0, 56)">
 <g transform="translate(30, 56)" class="key keypos-0">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key"/>
@@ -285,7 +291,7 @@ path.combo { stroke: #7f7f7f; }
 </g>
 <g transform="translate(360, 56)" class="key keypos-5">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key"/>
-<text x="0" y="0" class="key tap">pg🠕</text>
+<text x="0" y="0" class="key tap">first</text>
 </g>
 <g transform="translate(420, 28)" class="key keypos-6">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key"/>
@@ -313,7 +319,7 @@ path.combo { stroke: #7f7f7f; }
 </g>
 <g transform="translate(150, 84)" class="key keypos-12">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key"/>
-<text x="0" y="0" class="key tap">shift</text>
+<text x="0" y="0" class="key tap">shft</text>
 </g>
 <g transform="translate(210, 84)" class="key keypos-13">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key"/>
@@ -325,7 +331,7 @@ path.combo { stroke: #7f7f7f; }
 </g>
 <g transform="translate(360, 112)" class="key keypos-15">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key"/>
-<text x="0" y="0" class="key tap">pg🠗</text>
+<text x="0" y="0" class="key tap">last</text>
 </g>
 <g transform="translate(420, 84)" class="key keypos-16">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key"/>
@@ -333,7 +339,7 @@ path.combo { stroke: #7f7f7f; }
 </g>
 <g transform="translate(480, 84)" class="key keypos-17">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key"/>
-<text x="0" y="0" class="key tap">enter</text>
+<text x="0" y="0" class="key tap">entr</text>
 </g>
 <g transform="translate(540, 84)" class="key keypos-18">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key"/>
@@ -357,9 +363,7 @@ path.combo { stroke: #7f7f7f; }
 </g>
 <g transform="translate(420, 140)" class="key keypos-23">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">back</tspan><tspan x="0" dy="1.2em">space</tspan>
-</text>
+<text x="0" y="0" class="key tap">bksp</text>
 </g>
 <g transform="translate(480, 140)" class="key keypos-24">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key"/>
@@ -390,7 +394,7 @@ path.combo { stroke: #7f7f7f; }
 </g>
 </g>
 <g transform="translate(30, 280)" class="layer-sym">
-<text x="0" y="28" class="label">sym:</text>
+<text x="0" y="28" class="label" id="sym">sym:</text>
 <g transform="translate(0, 56)">
 <g transform="translate(30, 56)" class="key keypos-0">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key"/>
@@ -462,7 +466,7 @@ path.combo { stroke: #7f7f7f; }
 </g>
 <g transform="translate(480, 84)" class="key keypos-17">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key"/>
-<text x="0" y="0" class="key tap">shift</text>
+<text x="0" y="0" class="key tap">shft</text>
 </g>
 <g transform="translate(540, 84)" class="key keypos-18">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key"/>
@@ -511,7 +515,7 @@ path.combo { stroke: #7f7f7f; }
 </g>
 </g>
 <g transform="translate(720, 280)" class="layer-num">
-<text x="0" y="28" class="label">num:</text>
+<text x="0" y="28" class="label" id="num">num:</text>
 <g transform="translate(0, 56)">
 <g transform="translate(30, 56)" class="key keypos-0">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key"/>
@@ -556,7 +560,7 @@ path.combo { stroke: #7f7f7f; }
 <g transform="translate(150, 84)" class="key keypos-12">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key"/>
 <text x="0" y="0" class="key tap">3</text>
-<text x="0" y="24" class="key hold">shift</text>
+<text x="0" y="24" class="key hold">shft</text>
 </g>
 <g transform="translate(210, 84)" class="key keypos-13">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key"/>
@@ -579,7 +583,7 @@ path.combo { stroke: #7f7f7f; }
 <g transform="translate(480, 84)" class="key keypos-17">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key"/>
 <text x="0" y="0" class="key tap">8</text>
-<text x="0" y="24" class="key hold">shift</text>
+<text x="0" y="24" class="key hold">shft</text>
 </g>
 <g transform="translate(540, 84)" class="key keypos-18">
 <rect rx="6" ry="6" x="-28" y="-26" width="56" height="52" class="key"/>
@@ -623,7 +627,7 @@ path.combo { stroke: #7f7f7f; }
 </g>
 </g>
 </g>
-<text x="30" y="588" class="label">Combos:</text>
+<text x="30" y="588" class="label" id="Combos">Combos:</text>
 <g transform="translate(30, 560)" class="layer-combopos-0">
 <g transform="translate(0, 56)">
 <g transform="translate(30, 28)" class="key  combo-separate keypos-0">
diff --git a/keymap-drawer.yaml b/keymap-drawer.yaml
index 867918b..453dc80 100644
--- a/keymap-drawer.yaml
+++ b/keymap-drawer.yaml
@@ -18,19 +18,19 @@ layers:
   - shift
   - sym
   nav:
-  - [f1, f2, f3, f4, f5, pg🠕, esc, 🠕, tab, home]
-  - [gui, alt, shift, ctrl, undo, pg🠗, 🠔, enter, ➝, end]
-  - [cut, copy, paste, back space, 🠗, del]
+  - [f1, f2, f3, f4, f5, first, esc, 🠕, tab, home]
+  - [gui, alt, shft, ctrl, undo, last, 🠔, entr, ➝, end]
+  - [cut, copy, paste, bksp, 🠗, del]
   - [{t: '', type: held}, '', '', '']
   sym:
   - ['!', '@', '#', $, '%', ^, '&', ';', ':', '?']
-  - ['~', '=', '-', '/', '`', '\', ctrl, shift, alt, gui]
+  - ['~', '=', '-', '/', '`', '\', ctrl, shft, alt, gui]
   - ['_', '+', '*', '|', <, '>']
   - ['', '', '', {t: '', type: held}]
   num:
   - ['', '', '', '', '', '', '', '', '', '']
-  - [{t: '1', h: gui}, {t: '2', h: alt}, {t: '3', h: shift}, {t: '4', h: ctrl}, '5',
-      '6', {t: '7', h: ctrl}, {t: '8', h: shift}, {t: '9', h: alt}, {t: '0', h: gui}]
+  - [{t: '1', h: gui}, {t: '2', h: alt}, {t: '3', h: shft}, {t: '4', h: ctrl}, '5',
+      '6', {t: '7', h: ctrl}, {t: '8', h: shft}, {t: '9', h: alt}, {t: '0', h: gui}]
   - ['', '', '', '', '', '']
   - [{t: '', type: held}, '', '', {t: '', type: held}]
 combos: