diff --git a/docs/uninotes/s1/bo-dcm1109/index.html b/docs/uninotes/s1/bo-dcm1109/index.html
index afe4a0e..59f091d 100644
--- a/docs/uninotes/s1/bo-dcm1109/index.html
+++ b/docs/uninotes/s1/bo-dcm1109/index.html
@@ -9,4 +9,5 @@
 <a href=/uninotes/s1/bo-dcm1109/index.xml class="mobile-link mobile-link--subscribe"><svg viewBox="0 0 24 24" width="12" height="12" fill="currentColor" aria-hidden="true"><path d="M6.18 15.64a2.18 2.18.0 012.18 2.18c0 1.19-.98 2.18-2.18 2.18C4.98 20 4 19.01 4 17.82a2.18 2.18.0 012.18-2.18M4 4.44A15.56 15.56.0 0119.56 20h-2.83A12.73 12.73.0 004 7.27V4.44m0 5.66a9.9 9.9.0 019.9 9.9h-2.83A7.07 7.07.0 004 12.93V10.1z"/></svg>
 Subscribe</a></div></div></div></div><nav class="menu language"><ul class="menu__list language__list"><li class=menu__item><a class=menu__link href=/>Home</a></li><li class=menu__item><a class=menu__link href=/blog/>Blog</a></li><li class=menu__item><a class=menu__link href=/services/>Services</a></li><li class=menu__item><a class=menu__link href=/uninotes/>UniNotes</a></li><li class=menu__item><a class=menu__link href=/contact/>Contact</a></li></ul></nav></header><main class=main><nav class="uninotes-breadcrumbs breadcrumbs"><a href=/uninotes/>UniNotes</a>
 › <a href=/uninotes/s1/>S1</a>
-› <span>BO DCM1109</span></nav><h1>BO DCM1109</h1><ul class="uninotes-list uninotes-list--units"><li class=uninotes-list__item><a class=uninotes-list__link href=/uninotes/s1/bo-dcm1109/unit1/>Unit 1</a></li><li class=uninotes-list__item><a class=uninotes-list__link href=/uninotes/s1/bo-dcm1109/unit11/>Unit 11</a></li><li class=uninotes-list__item><a class=uninotes-list__link href=/uninotes/s1/bo-dcm1109/unit2/>Unit 2</a></li><li class=uninotes-list__item><a class=uninotes-list__link href=/uninotes/s1/bo-dcm1109/unit3/>Unit 3</a></li></ul><nav class=page-nav><a class=page-nav__next-link href=/uninotes/s1/et-dcm1107/>ET DCM1107 →</a></nav></main><footer class=footer><p class=footer__copyright-notice>&copy; <a href=https://freedoms4.org>freedoms4.org</a> <a href=/changelog/>Changelog</a></p><p class=footer__theme-info>Built with <a href=https://gohugo.io>Hugo</a> and based on <a href=https://github.com/CyrusYip/hugo-theme-yue>Yue</a> theme</p></footer><script>(function(){var e=document.getElementById("theme-toggle");if(!e)return;function t(){var e=localStorage.getItem("theme");return e?e:window.matchMedia("(prefers-color-scheme: light)").matches?"light":"dark"}function n(e){document.documentElement.setAttribute("data-theme",e),localStorage.setItem("theme",e)}n(t()),e.addEventListener("click",function(){var e=document.documentElement.getAttribute("data-theme")||t();n(e==="dark"?"light":"dark")})})()</script><script>(function(){var e=document.getElementById("mobile-menu-check");if(!e)return;document.addEventListener("click",function(t){if(!e.checked)return;var n=e.closest(".brand__mobile-menu");n&&!n.contains(t.target)&&(e.checked=!1)})})()</script></body></html>
\ No newline at end of file
+› <span>BO DCM1109</span></nav><h1>BO DCM1109</h1><ul class="uninotes-list uninotes-list--units"><li class=uninotes-list__item><a class=uninotes-list__link href=/uninotes/s1/bo-dcm1109/unit1/>Unit 1</a></li><li class=uninotes-list__item><a class=uninotes-list__link href=/uninotes/s1/bo-dcm1109/unit2/>Unit 2</a></li><li class=uninotes-list__item><a class=uninotes-list__link href=/uninotes/s1/bo-dcm1109/unit3/>Unit 3</a></li><li class=uninotes-list__item><a class=uninotes-list__link href=/uninotes/s1/bo-dcm1109/unit11/>Unit 11</a></li></ul><nav class=page-nav><a class=page-nav__previous-link href=/uninotes/s1/et-dcm1107/>← ET DCM1107</a>
+<a class=page-nav__next-link href=/uninotes/s1/pbm-dcm1110/>PBM DCM1110 →</a></nav></main><footer class=footer><p class=footer__copyright-notice>&copy; <a href=https://freedoms4.org>freedoms4.org</a> <a href=/changelog/>Changelog</a></p><p class=footer__theme-info>Built with <a href=https://gohugo.io>Hugo</a> and based on <a href=https://github.com/CyrusYip/hugo-theme-yue>Yue</a> theme</p></footer><script>(function(){var e=document.getElementById("theme-toggle");if(!e)return;function t(){var e=localStorage.getItem("theme");return e?e:window.matchMedia("(prefers-color-scheme: light)").matches?"light":"dark"}function n(e){document.documentElement.setAttribute("data-theme",e),localStorage.setItem("theme",e)}n(t()),e.addEventListener("click",function(){var e=document.documentElement.getAttribute("data-theme")||t();n(e==="dark"?"light":"dark")})})()</script><script>(function(){var e=document.getElementById("mobile-menu-check");if(!e)return;document.addEventListener("click",function(t){if(!e.checked)return;var n=e.closest(".brand__mobile-menu");n&&!n.contains(t.target)&&(e.checked=!1)})})()</script></body></html>
\ No newline at end of file
diff --git a/docs/uninotes/s1/et-dcm1107/index.html b/docs/uninotes/s1/et-dcm1107/index.html
index 216e96d..6f88ae5 100644
--- a/docs/uninotes/s1/et-dcm1107/index.html
+++ b/docs/uninotes/s1/et-dcm1107/index.html
@@ -9,5 +9,5 @@
 <a href=/uninotes/s1/et-dcm1107/index.xml class="mobile-link mobile-link--subscribe"><svg viewBox="0 0 24 24" width="12" height="12" fill="currentColor" aria-hidden="true"><path d="M6.18 15.64a2.18 2.18.0 012.18 2.18c0 1.19-.98 2.18-2.18 2.18C4.98 20 4 19.01 4 17.82a2.18 2.18.0 012.18-2.18M4 4.44A15.56 15.56.0 0119.56 20h-2.83A12.73 12.73.0 004 7.27V4.44m0 5.66a9.9 9.9.0 019.9 9.9h-2.83A7.07 7.07.0 004 12.93V10.1z"/></svg>
 Subscribe</a></div></div></div></div><nav class="menu language"><ul class="menu__list language__list"><li class=menu__item><a class=menu__link href=/>Home</a></li><li class=menu__item><a class=menu__link href=/blog/>Blog</a></li><li class=menu__item><a class=menu__link href=/services/>Services</a></li><li class=menu__item><a class=menu__link href=/uninotes/>UniNotes</a></li><li class=menu__item><a class=menu__link href=/contact/>Contact</a></li></ul></nav></header><main class=main><nav class="uninotes-breadcrumbs breadcrumbs"><a href=/uninotes/>UniNotes</a>
 › <a href=/uninotes/s1/>S1</a>
-› <span>ET DCM1107</span></nav><h1>ET DCM1107</h1><ul class="uninotes-list uninotes-list--units"><li class=uninotes-list__item><a class=uninotes-list__link href=/uninotes/s1/et-dcm1107/unit1/>Unit 1</a></li><li class=uninotes-list__item><a class=uninotes-list__link href=/uninotes/s1/et-dcm1107/unit2/>Unit 2</a></li><li class=uninotes-list__item><a class=uninotes-list__link href=/uninotes/s1/et-dcm1107/unit5/>Unit 5</a></li><li class=uninotes-list__item><a class=uninotes-list__link href=/uninotes/s1/et-dcm1107/unit6/>Unit 6</a></li><li class=uninotes-list__item><a class=uninotes-list__link href=/uninotes/s1/et-dcm1107/unit7/>Unit 7</a></li></ul><nav class=page-nav><a class=page-nav__previous-link href=/uninotes/s1/bo-dcm1109/>← BO DCM1109</a>
-<a class=page-nav__next-link href=/uninotes/s1/ge-dcm1106/>GE DCM1106 →</a></nav></main><footer class=footer><p class=footer__copyright-notice>&copy; <a href=https://freedoms4.org>freedoms4.org</a> <a href=/changelog/>Changelog</a></p><p class=footer__theme-info>Built with <a href=https://gohugo.io>Hugo</a> and based on <a href=https://github.com/CyrusYip/hugo-theme-yue>Yue</a> theme</p></footer><script>(function(){var e=document.getElementById("theme-toggle");if(!e)return;function t(){var e=localStorage.getItem("theme");return e?e:window.matchMedia("(prefers-color-scheme: light)").matches?"light":"dark"}function n(e){document.documentElement.setAttribute("data-theme",e),localStorage.setItem("theme",e)}n(t()),e.addEventListener("click",function(){var e=document.documentElement.getAttribute("data-theme")||t();n(e==="dark"?"light":"dark")})})()</script><script>(function(){var e=document.getElementById("mobile-menu-check");if(!e)return;document.addEventListener("click",function(t){if(!e.checked)return;var n=e.closest(".brand__mobile-menu");n&&!n.contains(t.target)&&(e.checked=!1)})})()</script></body></html>
\ No newline at end of file
+› <span>ET DCM1107</span></nav><h1>ET DCM1107</h1><ul class="uninotes-list uninotes-list--units"><li class=uninotes-list__item><a class=uninotes-list__link href=/uninotes/s1/et-dcm1107/unit1/>Unit 1</a></li><li class=uninotes-list__item><a class=uninotes-list__link href=/uninotes/s1/et-dcm1107/unit2/>Unit 2</a></li><li class=uninotes-list__item><a class=uninotes-list__link href=/uninotes/s1/et-dcm1107/unit5/>Unit 5</a></li><li class=uninotes-list__item><a class=uninotes-list__link href=/uninotes/s1/et-dcm1107/unit6/>Unit 6</a></li><li class=uninotes-list__item><a class=uninotes-list__link href=/uninotes/s1/et-dcm1107/unit7/>Unit 7</a></li></ul><nav class=page-nav><a class=page-nav__previous-link href=/uninotes/s1/ge-dcm1106/>← GE DCM1106</a>
+<a class=page-nav__next-link href=/uninotes/s1/bo-dcm1109/>BO DCM1109 →</a></nav></main><footer class=footer><p class=footer__copyright-notice>&copy; <a href=https://freedoms4.org>freedoms4.org</a> <a href=/changelog/>Changelog</a></p><p class=footer__theme-info>Built with <a href=https://gohugo.io>Hugo</a> and based on <a href=https://github.com/CyrusYip/hugo-theme-yue>Yue</a> theme</p></footer><script>(function(){var e=document.getElementById("theme-toggle");if(!e)return;function t(){var e=localStorage.getItem("theme");return e?e:window.matchMedia("(prefers-color-scheme: light)").matches?"light":"dark"}function n(e){document.documentElement.setAttribute("data-theme",e),localStorage.setItem("theme",e)}n(t()),e.addEventListener("click",function(){var e=document.documentElement.getAttribute("data-theme")||t();n(e==="dark"?"light":"dark")})})()</script><script>(function(){var e=document.getElementById("mobile-menu-check");if(!e)return;document.addEventListener("click",function(t){if(!e.checked)return;var n=e.closest(".brand__mobile-menu");n&&!n.contains(t.target)&&(e.checked=!1)})})()</script></body></html>
\ No newline at end of file
diff --git a/docs/uninotes/s1/ge-dcm1106/index.html b/docs/uninotes/s1/ge-dcm1106/index.html
index bc80b86..37374b1 100644
--- a/docs/uninotes/s1/ge-dcm1106/index.html
+++ b/docs/uninotes/s1/ge-dcm1106/index.html
@@ -9,5 +9,4 @@
 <a href=/uninotes/s1/ge-dcm1106/index.xml class="mobile-link mobile-link--subscribe"><svg viewBox="0 0 24 24" width="12" height="12" fill="currentColor" aria-hidden="true"><path d="M6.18 15.64a2.18 2.18.0 012.18 2.18c0 1.19-.98 2.18-2.18 2.18C4.98 20 4 19.01 4 17.82a2.18 2.18.0 012.18-2.18M4 4.44A15.56 15.56.0 0119.56 20h-2.83A12.73 12.73.0 004 7.27V4.44m0 5.66a9.9 9.9.0 019.9 9.9h-2.83A7.07 7.07.0 004 12.93V10.1z"/></svg>
 Subscribe</a></div></div></div></div><nav class="menu language"><ul class="menu__list language__list"><li class=menu__item><a class=menu__link href=/>Home</a></li><li class=menu__item><a class=menu__link href=/blog/>Blog</a></li><li class=menu__item><a class=menu__link href=/services/>Services</a></li><li class=menu__item><a class=menu__link href=/uninotes/>UniNotes</a></li><li class=menu__item><a class=menu__link href=/contact/>Contact</a></li></ul></nav></header><main class=main><nav class="uninotes-breadcrumbs breadcrumbs"><a href=/uninotes/>UniNotes</a>
 › <a href=/uninotes/s1/>S1</a>
-› <span>GE DCM1106</span></nav><h1>GE DCM1106</h1><ul class="uninotes-list uninotes-list--units"><li class=uninotes-list__item><a class=uninotes-list__link href=/uninotes/s1/ge-dcm1106/unit1/>Unit 1</a></li></ul><nav class=page-nav><a class=page-nav__previous-link href=/uninotes/s1/et-dcm1107/>← ET DCM1107</a>
-<a class=page-nav__next-link href=/uninotes/s1/pbm-dcm1110/>PBM DCM1110 →</a></nav></main><footer class=footer><p class=footer__copyright-notice>&copy; <a href=https://freedoms4.org>freedoms4.org</a> <a href=/changelog/>Changelog</a></p><p class=footer__theme-info>Built with <a href=https://gohugo.io>Hugo</a> and based on <a href=https://github.com/CyrusYip/hugo-theme-yue>Yue</a> theme</p></footer><script>(function(){var e=document.getElementById("theme-toggle");if(!e)return;function t(){var e=localStorage.getItem("theme");return e?e:window.matchMedia("(prefers-color-scheme: light)").matches?"light":"dark"}function n(e){document.documentElement.setAttribute("data-theme",e),localStorage.setItem("theme",e)}n(t()),e.addEventListener("click",function(){var e=document.documentElement.getAttribute("data-theme")||t();n(e==="dark"?"light":"dark")})})()</script><script>(function(){var e=document.getElementById("mobile-menu-check");if(!e)return;document.addEventListener("click",function(t){if(!e.checked)return;var n=e.closest(".brand__mobile-menu");n&&!n.contains(t.target)&&(e.checked=!1)})})()</script></body></html>
\ No newline at end of file
+› <span>GE DCM1106</span></nav><h1>GE DCM1106</h1><ul class="uninotes-list uninotes-list--units"><li class=uninotes-list__item><a class=uninotes-list__link href=/uninotes/s1/ge-dcm1106/unit1/>Unit 1</a></li></ul><nav class=page-nav><a class=page-nav__next-link href=/uninotes/s1/et-dcm1107/>ET DCM1107 →</a></nav></main><footer class=footer><p class=footer__copyright-notice>&copy; <a href=https://freedoms4.org>freedoms4.org</a> <a href=/changelog/>Changelog</a></p><p class=footer__theme-info>Built with <a href=https://gohugo.io>Hugo</a> and based on <a href=https://github.com/CyrusYip/hugo-theme-yue>Yue</a> theme</p></footer><script>(function(){var e=document.getElementById("theme-toggle");if(!e)return;function t(){var e=localStorage.getItem("theme");return e?e:window.matchMedia("(prefers-color-scheme: light)").matches?"light":"dark"}function n(e){document.documentElement.setAttribute("data-theme",e),localStorage.setItem("theme",e)}n(t()),e.addEventListener("click",function(){var e=document.documentElement.getAttribute("data-theme")||t();n(e==="dark"?"light":"dark")})})()</script><script>(function(){var e=document.getElementById("mobile-menu-check");if(!e)return;document.addEventListener("click",function(t){if(!e.checked)return;var n=e.closest(".brand__mobile-menu");n&&!n.contains(t.target)&&(e.checked=!1)})})()</script></body></html>
\ No newline at end of file
diff --git a/docs/uninotes/s1/pbm-dcm1110/index.html b/docs/uninotes/s1/pbm-dcm1110/index.html
index 08d4df6..e92f57c 100644
--- a/docs/uninotes/s1/pbm-dcm1110/index.html
+++ b/docs/uninotes/s1/pbm-dcm1110/index.html
@@ -9,4 +9,4 @@
 <a href=/uninotes/s1/pbm-dcm1110/index.xml class="mobile-link mobile-link--subscribe"><svg viewBox="0 0 24 24" width="12" height="12" fill="currentColor" aria-hidden="true"><path d="M6.18 15.64a2.18 2.18.0 012.18 2.18c0 1.19-.98 2.18-2.18 2.18C4.98 20 4 19.01 4 17.82a2.18 2.18.0 012.18-2.18M4 4.44A15.56 15.56.0 0119.56 20h-2.83A12.73 12.73.0 004 7.27V4.44m0 5.66a9.9 9.9.0 019.9 9.9h-2.83A7.07 7.07.0 004 12.93V10.1z"/></svg>
 Subscribe</a></div></div></div></div><nav class="menu language"><ul class="menu__list language__list"><li class=menu__item><a class=menu__link href=/>Home</a></li><li class=menu__item><a class=menu__link href=/blog/>Blog</a></li><li class=menu__item><a class=menu__link href=/services/>Services</a></li><li class=menu__item><a class=menu__link href=/uninotes/>UniNotes</a></li><li class=menu__item><a class=menu__link href=/contact/>Contact</a></li></ul></nav></header><main class=main><nav class="uninotes-breadcrumbs breadcrumbs"><a href=/uninotes/>UniNotes</a>
 › <a href=/uninotes/s1/>S1</a>
-› <span>PBM DCM1110</span></nav><h1>PBM DCM1110</h1><ul class="uninotes-list uninotes-list--units"><li class=uninotes-list__item><a class=uninotes-list__link href=/uninotes/s1/pbm-dcm1110/unit1/>Unit 1</a></li><li class=uninotes-list__item><a class=uninotes-list__link href=/uninotes/s1/pbm-dcm1110/unit2/>Unit 2</a></li><li class=uninotes-list__item><a class=uninotes-list__link href=/uninotes/s1/pbm-dcm1110/unit3/>Unit 3</a></li><li class=uninotes-list__item><a class=uninotes-list__link href=/uninotes/s1/pbm-dcm1110/unit4/>Unit 4</a></li></ul><nav class=page-nav><a class=page-nav__previous-link href=/uninotes/s1/ge-dcm1106/>← GE DCM1106</a></nav></main><footer class=footer><p class=footer__copyright-notice>&copy; <a href=https://freedoms4.org>freedoms4.org</a> <a href=/changelog/>Changelog</a></p><p class=footer__theme-info>Built with <a href=https://gohugo.io>Hugo</a> and based on <a href=https://github.com/CyrusYip/hugo-theme-yue>Yue</a> theme</p></footer><script>(function(){var e=document.getElementById("theme-toggle");if(!e)return;function t(){var e=localStorage.getItem("theme");return e?e:window.matchMedia("(prefers-color-scheme: light)").matches?"light":"dark"}function n(e){document.documentElement.setAttribute("data-theme",e),localStorage.setItem("theme",e)}n(t()),e.addEventListener("click",function(){var e=document.documentElement.getAttribute("data-theme")||t();n(e==="dark"?"light":"dark")})})()</script><script>(function(){var e=document.getElementById("mobile-menu-check");if(!e)return;document.addEventListener("click",function(t){if(!e.checked)return;var n=e.closest(".brand__mobile-menu");n&&!n.contains(t.target)&&(e.checked=!1)})})()</script></body></html>
\ No newline at end of file
+› <span>PBM DCM1110</span></nav><h1>PBM DCM1110</h1><ul class="uninotes-list uninotes-list--units"><li class=uninotes-list__item><a class=uninotes-list__link href=/uninotes/s1/pbm-dcm1110/unit1/>Unit 1</a></li><li class=uninotes-list__item><a class=uninotes-list__link href=/uninotes/s1/pbm-dcm1110/unit2/>Unit 2</a></li><li class=uninotes-list__item><a class=uninotes-list__link href=/uninotes/s1/pbm-dcm1110/unit3/>Unit 3</a></li><li class=uninotes-list__item><a class=uninotes-list__link href=/uninotes/s1/pbm-dcm1110/unit4/>Unit 4</a></li></ul><nav class=page-nav><a class=page-nav__previous-link href=/uninotes/s1/bo-dcm1109/>← BO DCM1109</a></nav></main><footer class=footer><p class=footer__copyright-notice>&copy; <a href=https://freedoms4.org>freedoms4.org</a> <a href=/changelog/>Changelog</a></p><p class=footer__theme-info>Built with <a href=https://gohugo.io>Hugo</a> and based on <a href=https://github.com/CyrusYip/hugo-theme-yue>Yue</a> theme</p></footer><script>(function(){var e=document.getElementById("theme-toggle");if(!e)return;function t(){var e=localStorage.getItem("theme");return e?e:window.matchMedia("(prefers-color-scheme: light)").matches?"light":"dark"}function n(e){document.documentElement.setAttribute("data-theme",e),localStorage.setItem("theme",e)}n(t()),e.addEventListener("click",function(){var e=document.documentElement.getAttribute("data-theme")||t();n(e==="dark"?"light":"dark")})})()</script><script>(function(){var e=document.getElementById("mobile-menu-check");if(!e)return;document.addEventListener("click",function(t){if(!e.checked)return;var n=e.closest(".brand__mobile-menu");n&&!n.contains(t.target)&&(e.checked=!1)})})()</script></body></html>
\ No newline at end of file
diff --git a/layouts/subjectcode/term.html b/layouts/subjectcode/term.html
index d3a1905..6485309 100644
--- a/layouts/subjectcode/term.html
+++ b/layouts/subjectcode/term.html
@@ -28,25 +28,41 @@
 
 <h1>{{ $subjectCode }}</h1>
 
-<ul class="uninotes-list uninotes-list--units">
-  {{ $seenUnits := slice }}
-  {{ range .Pages.ByWeight }}
-    {{ $unitLabel := (.Params.unit | default .Title) }}
-    {{ if not (in $seenUnits $unitLabel) }}
-      {{ $seenUnits = $seenUnits | append $unitLabel }}
-      <li class="uninotes-list__item">
-        <a class="uninotes-list__link" href="{{ .Params.uniturl }}">
-          {{ $unitLabel }}
-        </a>
-      </li>
+{{/* Collect unique unit labels and sort numerically */}}
+{{ $seenUnits := slice }}
+{{ $unitDicts := slice }}
+{{ range .Pages }}
+  {{ $unitLabel := (.Params.unit | default .Title) }}
+  {{ if not (in $seenUnits $unitLabel) }}
+    {{ $seenUnits = $seenUnits | append $unitLabel }}
+    {{/* Extract unit number for numeric sort, e.g. "Unit 11" → 11 */}}
+    {{ $uParts := split $unitLabel " " }}
+    {{ $uLast := index $uParts (sub (len $uParts) 1) }}
+    {{ $uNumStr := "" }}
+    {{ range (split $uLast "") }}
+      {{ if ge . "0" }}{{ if le . "9" }}{{ $uNumStr = printf "%s%s" $uNumStr . }}{{ end }}{{ end }}
     {{ end }}
+    {{ $uNum := int ($uNumStr | default "0") }}
+    {{ $unitDicts = $unitDicts | append (dict "label" $unitLabel "page" . "num" $uNum) }}
+  {{ end }}
+{{ end }}
+{{ $sortedUnitDicts := sort $unitDicts "num" }}
+
+<ul class="uninotes-list uninotes-list--units">
+  {{ range $sortedUnitDicts }}
+    <li class="uninotes-list__item">
+      <a class="uninotes-list__link" href="{{ .page.Params.uniturl }}">
+        {{ .label }}
+      </a>
+    </li>
   {{ end }}
 </ul>
 
-{{/* Subject prev/next — siblings in same semester */}}
+{{/* Subject prev/next — siblings in same semester, sorted numerically by code number */}}
 {{ if $semester }}
   {{ $semPage := site.GetPage (printf "/semester/%s" ($semester | urlize)) }}
   {{ if $semPage }}
+    {{/* Collect unique subject codes */}}
     {{ $siblingCodes := slice }}
     {{ range $semPage.Pages }}
       {{ $raw := .Params.subjectcode }}
@@ -60,23 +76,37 @@
         {{ $siblingCodes = $siblingCodes | append $code }}
       {{ end }}
     {{ end }}
-    {{ $siblingCodes = sort $siblingCodes }}
 
-    {{ if gt (len $siblingCodes) 1 }}
+    {{/* Sort subject codes numerically by extracting the number (e.g. "BO DCM1109" → 1109) */}}
+    {{ $codeDicts := slice }}
+    {{ range $siblingCodes }}
+      {{ $code := . }}
+      {{ $parts := split $code " " }}
+      {{ $lastPart := index $parts (sub (len $parts) 1) }}
+      {{ $numStr := "" }}
+      {{ range (split $lastPart "") }}
+        {{ if ge . "0" }}{{ if le . "9" }}{{ $numStr = printf "%s%s" $numStr . }}{{ end }}{{ end }}
+      {{ end }}
+      {{ $num := int ($numStr | default "0") }}
+      {{ $codeDicts = $codeDicts | append (dict "code" $code "num" $num) }}
+    {{ end }}
+    {{ $sortedCodeDicts := sort $codeDicts "num" }}
+
+    {{ if gt (len $sortedCodeDicts) 1 }}
       {{ $currentIdx := 0 }}
-      {{ range $i, $c := $siblingCodes }}
-        {{ if eq $c $subjectCode }}{{ $currentIdx = $i }}{{ end }}
+      {{ range $i, $d := $sortedCodeDicts }}
+        {{ if eq $d.code $subjectCode }}{{ $currentIdx = $i }}{{ end }}
       {{ end }}
       <nav class="page-nav">
         {{ if gt $currentIdx 0 }}
-          {{ $prevCode := index $siblingCodes (sub $currentIdx 1) }}
+          {{ $prevCode := (index $sortedCodeDicts (sub $currentIdx 1)).code }}
           {{ $prevPage := site.GetPage (printf "/subjectcode/%s" ($prevCode | urlize)) }}
           {{ if $prevPage }}
             <a class="page-nav__previous-link" href="{{ $prevPage.RelPermalink }}">← {{ $prevCode }}</a>
           {{ end }}
         {{ end }}
-        {{ if lt $currentIdx (sub (len $siblingCodes) 1) }}
-          {{ $nextCode := index $siblingCodes (add $currentIdx 1) }}
+        {{ if lt $currentIdx (sub (len $sortedCodeDicts) 1) }}
+          {{ $nextCode := (index $sortedCodeDicts (add $currentIdx 1)).code }}
           {{ $nextPage := site.GetPage (printf "/subjectcode/%s" ($nextCode | urlize)) }}
           {{ if $nextPage }}
             <a class="page-nav__next-link" href="{{ $nextPage.RelPermalink }}">{{ $nextCode }} →</a>