diff --git a/docs/beamlines/contacts.md b/docs/beamlines/contacts.md
index 69f7b51..0e04462 100644
--- a/docs/beamlines/contacts.md
+++ b/docs/beamlines/contacts.md
@@ -2,33 +2,36 @@
 title: Beamline Contacts
 description: Table of all beamlines and their phone numbers
 template: main.html
-
-hide:
-  - toc
 ---
 
-## Beamline Hutch Phone
+  | **Location** | **Source**    | **Beamline**      | **Hutch Phone Nr.**                                                     |
+  | :----------- | :------------ | :---------------- | :---------------------------------------------------------------------- |
+  | X01DD        | Bend          | NEMO[^1]          | [5144](tel:	+41 56 310 5144)                                           |
+  | X01DA        | Superbend 2 T | Debye[^1]         | [5307](tel:	+41 56 310 5307)                                           |
+  | X02SA        | U15           | I-TOMCAT          | EH1: [5312](tel:	+41 56 310 5312)<br> EH2: [5322](tel:	+41 56 310 5322) |
+  | X02DA        | Superbend 2 T | S-TOMCAT          | [5192](tel:	+41 56 310 5192)                                           |
+  | X03MA        | UE38          | ADRESS            | tbd                                                                     |
+  | X03DA        | Bend          | --                | --                                                                      |
+  | X04SA        | U14           | ADDAMS            | [5083](tel:	+41 56 310 5083)                                           |
+  | X04DB        | Bend          | VUV               | tbd                                                                     |
+  | X05LA        | UE90          | QUEST             | tbd                                                                     |
+  | X05DA        | Bend          | OPTICS[^2]        | tbd                                                                     |
+  | X06SA        | U19           | PX-I              | tbd                                                                     |
+  | X06DA        | Bend          | PX-III            | tbd                                                                     |
+  | X07MA        | UE38          | PHOENIX & X-Treme | tbd                                                                     |
+  | X07DB        | Bend          | NanoXAS           | tbd                                                                     |
+  | X07DA        | Bend          | PolLux            | [5474](tel:	+41 56 310 5474)                                           |
+  | X08SA        | U17           | microXAS          | tbd                                                                     |
+  | X08DA        | Bend          | --                | tbd                                                                     |
+  | X08DB        | Bend          | DISCO             | [5144](tel:	+41 56 310 5144)                                           |
+  | X09LA        | U70           | XIL & PEARL       | tbd                                                                     |
+  | X09DA        | Bend          | NAPP              | tbd                                                                     |
+  | X10SA        | U19           | PX-II             | tbd                                                                     |
+  | X10DA        | Superbend 2 T | SuperXAS          | tbd                                                                     |
+  | X11MA        | 2xUE36        | SIM               | [5978](tel:	+41 56 310 5978)                                           |
+  | X11DA        | Bend          | --                | tbd                                                                     |
+  | X12SA        | U17           | cSAXS             | tbd                                                                     |
+  | X12DA        | Bend          | --                | tbd                                                                     |
 
-| **Sourcepoint** | **Beamline** | **Phone Nr.** |
-| :- | :- | :- |
-| X01DA | Debye    | [5307](tel:	+41 56 310 5307) |
-| X02DA | S-TOMCAT | [5192](tel:	+41 56 310 5192) |
-| X02SA | I-TOMCAT | EH1: [5312](tel:	+41 56 310 5312) <br> EH2: [5322](tel:	+41 56 310 5322) |
-| X04SA | ADDAMS   | [5083](tel:	+41 56 310 5083) | 
-| X07DA | PolLux   | [5474](tel:	+41 56 310 5474) |
-| X11MA | SIM      | [5978](tel:	+41 56 310 5978) |
-
-## Beamline DUO Contactlist
-
-<div id="duolistparent">
-  <iframe
-  marginwidth="0"
-  marginheight="0"
-  hspace="0"
-  vspace="0"
-  frameborder="0"
-  scrolling="no"
-  style="height:600px; width:100%; border:none;"
-  src="https://duo.psi.ch/phonebook/index.php?LAYOUT=PLAIN&F=1&MODE=&PAGE=1&SORTC=1&SORTD=A"
-  id="Iframe"></iframe>
-</div>
\ No newline at end of file
+  [^1]: Accelerator Diagnostics Beamline
+  [^2]: No User Operation
\ No newline at end of file
diff --git a/docs/beamlines/duolist.md b/docs/beamlines/duolist.md
new file mode 100644
index 0000000..5455cd0
--- /dev/null
+++ b/docs/beamlines/duolist.md
@@ -0,0 +1,18 @@
+---
+title: DUO Contact List
+description: Table of DUO beamlines and their contacts
+template: main.html
+---
+
+<div id="duolistparent">
+  <iframe
+  marginwidth="0"
+  marginheight="0"
+  hspace="0"
+  vspace="0"
+  frameborder="0"
+  scrolling="no"
+  style="height:600px; width:100%; border:none;"
+  src="https://duo.psi.ch/phonebook/index.php?LAYOUT=PLAIN&F=1&MODE=&PAGE=1&SORTC=1&SORTD=A"
+  id="Iframe"></iframe>
+</div>
\ No newline at end of file
diff --git a/docs/javascripts/pkgs/tablesort.min.js b/docs/javascripts/pkgs/tablesort.min.js
new file mode 100644
index 0000000..e745bef
--- /dev/null
+++ b/docs/javascripts/pkgs/tablesort.min.js
@@ -0,0 +1,6 @@
+/*!
+ * tablesort v5.7.0 (2025-12-26)
+ * http://tristen.ca/tablesort/demo/
+ * Copyright (c) 2025 ; Licensed MIT
+*/
+(()=>{function r(t,e){if(!(this instanceof r))return new r(t,e);if(!t||"TABLE"!==t.tagName)throw new Error("Element must be a table");this.init(t,e||{})}function v(t){var e;return window.CustomEvent&&"function"==typeof window.CustomEvent?e=new CustomEvent(t):(e=document.createEvent("CustomEvent")).initCustomEvent(t,!1,!1,void 0),e}function p(t,e){return e=e.sortAttribute||"data-sort",t.hasAttribute(e)?t.getAttribute(e):t.textContent||t.innerText||""}function A(t,e){return(t=t.trim().toLowerCase())===(e=e.trim().toLowerCase())?0:t<e?1:-1}function E(t,e){return[].slice.call(t).find(function(t){return t.getAttribute("data-sort-column-key")===e})}function x(n,o){return function(t,e){var r=n(t.td,e.td);return 0===r?o?e.index-t.index:t.index-e.index:r}}var y=[];r.extend=function(t,e,r){if("function"!=typeof e||"function"!=typeof r)throw new Error("Pattern and sort must be a function");y.push({name:t,pattern:e,sort:r})},r.prototype={init:function(t,e){var r,n,o,i=this;if(i.table=t,i.thead=!1,i.options=e,t.rows&&0<t.rows.length)if(t.tHead&&0<t.tHead.rows.length){for(a=0;a<t.tHead.rows.length;a++)if("thead"===t.tHead.rows[a].getAttribute("data-sort-method")){r=t.tHead.rows[a];break}r=r||t.tHead.rows[t.tHead.rows.length-1],i.thead=!0}else r=t.rows[0];if(r){for(var s=function(){i.current&&i.current!==this&&i.current.removeAttribute("aria-sort"),i.current=this,i.sortTable(this)},a=0;a<r.cells.length;a++)(o=r.cells[a]).setAttribute("role","columnheader"),"none"!==o.getAttribute("data-sort-method")&&(o.tabIndex=0,o.addEventListener("click",s,!1),o.addEventListener("keydown",function(t){"Enter"===t.key&&(t.preventDefault(),s.call(this))}),null!==o.getAttribute("data-sort-default"))&&(n=o);n&&(i.current=n,i.sortTable(n))}},sortTable:function(t,e){var r=this,n=t.getAttribute("data-sort-column-key"),o=t.cellIndex,i=A,s="",a=[],d=r.thead?0:1,u=t.getAttribute("data-sort-method"),l=t.hasAttribute("data-sort-reverse"),c=t.getAttribute("aria-sort");if(r.table.dispatchEvent(v("beforeSort")),e||(c="ascending"===c||"descending"!==c&&!!r.options.descending!=l?"descending":"ascending",t.setAttribute("aria-sort",c)),!(r.table.rows.length<2)){if(!u){for(;a.length<3&&d<r.table.tBodies[0].rows.length;)0<(s=(s=(h=n?E(r.table.tBodies[0].rows[d].cells,n):r.table.tBodies[0].rows[d].cells[o])?p(h,r.options):"").trim()).length&&a.push(s),d++;if(!a)return}for(d=0;d<y.length;d++)if(s=y[d],u){if(s.name===u){i=s.sort;break}}else if(a.every(s.pattern)){i=s.sort;break}for(r.col=o,d=0;d<r.table.tBodies.length;d++){var f,h,b=[],w={},g=0,m=0;if(!(r.table.tBodies[d].rows.length<2)){for(f=0;f<r.table.tBodies[d].rows.length;f++)"none"===(s=r.table.tBodies[d].rows[f]).getAttribute("data-sort-method")?w[g]=s:(h=n?E(s.cells,n):s.cells[r.col],b.push({tr:s,td:h?p(h,r.options):"",index:g})),g++;for("descending"===c?b.sort(x(i,!0)):(b.sort(x(i,!1)),b.reverse()),f=0;f<g;f++)w[f]?(s=w[f],m++):s=b[f-m].tr,r.table.tBodies[d].appendChild(s)}}r.table.dispatchEvent(v("afterSort"))}},refresh:function(){void 0!==this.current&&this.sortTable(this.current,!0)}},"undefined"!=typeof module&&module.exports?module.exports=r:window.Tablesort=r})();
\ No newline at end of file
diff --git a/docs/javascripts/tablesort.js b/docs/javascripts/tablesort.js
new file mode 100644
index 0000000..69c0ff3
--- /dev/null
+++ b/docs/javascripts/tablesort.js
@@ -0,0 +1,6 @@
+document$.subscribe(function() {
+  var tables = document.querySelectorAll("article table:not([class])")
+  tables.forEach(function(table) {
+    new Tablesort(table)
+  })
+})
\ No newline at end of file
diff --git a/includes/abbreviations.md b/includes/abbreviations.md
new file mode 100644
index 0000000..038eeaa
--- /dev/null
+++ b/includes/abbreviations.md
@@ -0,0 +1,40 @@
+*[ADTS]: Amplitude Dependent Tune Shift
+*[APD]: Avalanche Photo-Diode
+*[BDC]: Beam Dump Controller
+*[BDM]: Beam Development Meeting
+*[BDK]: Beam Dump Kicker
+*[BLM]: Beam Loss Monitor
+*[BPM]: Beam Position Monitor
+*[BRTL]: Booster-to-Ring-Transfer-Line
+*[CMOS]: Complementary Metal-Oxide-Semiconductor
+*[DISCO]: Diagnostic Instruments for Synchrotron radiation COntrol
+*[DLSR]: Diffraction Limited Storage Ring
+*[DUO]: Digital User Office
+*[EPICS]: Experimental Physics and Industrial Control System
+*[EVR]: Event ReceiveR
+*[FE]: Front-End
+*[FOFB]: Fast-Orbit-Feed-Back
+*[FPFB]: Filling-Pattern-Feed-Back
+*[HW]: Hard-Ware
+*[ID]: Insertion Device
+*[IOC]: Input/Output Controller
+*[LLRF]: Low Lever Radio Frequency
+*[LOCO]: Linear Optics from Closed Orbits
+*[LTB]: Linac-to-Booster-transferline
+*[MBA]: Multi-Bend-Achromat
+*[MBFB]: Multi-Bunch-Feed-Back
+*[MDM]: Machine Development Meeting
+*[NAFF]: Numerical Analysis of Fundamental Frequencies
+*[NEG]:Non-Evaporable Getter
+*[NEMO]: Nice Emittance Measurement Optics
+*[OFB]: Orbit-Feed-Back
+*[PCT]: Parametric Current Transformer
+*[PV]: Process Variable
+*[RadFET]: Radiation sensing Field-Effect Transistor
+*[RF]: Radio Frequency
+*[SLS]: Swiss Light Source
+*[SSH]: Secure Shell
+*[SW]: Soft-Ware
+*[SU]: Radiation Protection
+*[UOM]: User Operation Meeting
+*[USB]: Universal Serial Bus
\ No newline at end of file
diff --git a/mkdocs.yml b/mkdocs.yml
index bf12465..3438a11 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -18,7 +18,9 @@ markdown_extensions:
     - pymdownx.mark
     - pymdownx.details
     - pymdownx.superfences
-    - pymdownx.snippets
+    - pymdownx.snippets:
+        auto_append:
+            - includes/abbreviations.md
     - admonition
     - tables
     - attr_list
@@ -47,6 +49,11 @@ extra_css:
   - stylesheets/extra.css
   - stylesheets/fonts.css
 
+extra_javascript:
+  - javascripts/pkgs/tablesort.min.js
+  - javascripts/tablesort.js
+#     - 'https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-MML-AM_CHTML'
+
 theme:
     name: 'material'
     font: false
@@ -57,15 +64,13 @@ theme:
         # - navigation.instant.progress
         - content.action.edit
         - content.tooltips
+        - content.footnote.tooltips
     icon:
         repo: fontawesome/brands/gitlab
     palette:
         primary: black
     custom_dir: overrides
 
-# extra_javascript:
-#     - 'https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-MML-AM_CHTML'
-
 # Mkdocs-Macros definitions
 extra:
     Alessandro : '[Alessandro](https://intranet.psi.ch/de/people/alessandro-citterio "Alessandro Citterio"){:target="_blank"}'
@@ -205,7 +210,8 @@ nav:
             # - 'Post Mortem' : machine/postmortem.md
         - 'JCM minutes' : machine/jcm.md
     - 'Beamlines': 
-        - 'Contacts'    : beamlines/contacts.md
+        - 'Overview'    : beamlines/contacts.md
+        - 'DUO List'    : beamlines/duolist.md
         - 'UOM minutes' : beamlines/uom.md
         - 'SU Permits'  : beamlines/SUpermits.md
     - 'Schedule' :