diff --git a/config.toml b/config.toml
index 080a79b..139f740 100644
--- a/config.toml
+++ b/config.toml
@@ -27,7 +27,7 @@ paginate = 5
   description = "EBK Startpage"
   #images = ["logo.jpg"]
   startPageColumns = true
-  welcomeText = "Linkliste Eigenbaukombinat"
+  welcomeText = "Linkliste start.eigenbaukombinat.de"
 
 [[params.searchEngines]]
   name = "Google"
diff --git a/data/links.yml b/data/links.yml
index 224077e..4542e83 100644
--- a/data/links.yml
+++ b/data/links.yml
@@ -83,30 +83,4 @@
     - title: Statistiken
       url: https://stats.eigenbaukombinat.de/
       icon: fas fa-chart-line
-- group: Admin Services
-  items:
-    - title: CheckMK<br>internal Monitoring
-      url: https://moni.eigenbaukombinat.de/EBK
-      icon: fas fa-check
-    - title: Uptimerobot<br>external Monitoring
-      url: https://stats.uptimerobot.com/N10ZzHN80N
-      icon: fas fa-robot
-    - title: Space-API-Endpunkt 
-      url: https://spaceapi.eigenbaukombinat.de/
-      icon: fas fa-server
-    - title: Kalender-API-Endpunkt
-      url: https://kalender.eigenbaukombinat.de/json/
-      icon: fas fa-server
-    - title: Kalendereintrag hinzufügen
-      url: https://kalender.eigenbaukombinat.de/add
-      icon: far fa-calendar-plus
-    - title: NodeRed Spacesteuerung<br>intern
-      url: https://codered.eigenbaukombinat.de/
-      icon: fab fa-node
-    - title: Grafana Dashboard<br>intern
-      url: http://grafana.lan
-      icon: fas fa-chart-area
-    - title: Matrix Föderation Tester
-      url: https://federationtester.matrix.org/#matrix.eigenbaukombinat.de
-      icon: fas fa-compass
 
diff --git a/data/links2.yml b/data/links2.yml
new file mode 100644
index 0000000..c9e7a99
--- /dev/null
+++ b/data/links2.yml
@@ -0,0 +1,83 @@
+---
+- group: Matrix Services
+  items:
+
+    - title: Matrix einrichten 
+      url: https://eigenbaukombinat.de/unser-neuer-chat-und-nachrichtenserver/
+      icon: fas fa-hotel
+
+    - title: Matrix Raumübersicht aller öffentlichen EBK-Räume
+      url: https://matrixrooms.info/search/?q=matrix.eigenbaukombinat.de
+      icon: fas fa-address-book
+  
+
+- group: Pad Services
+  items:
+    - title: Pad EBK-Orgatreffen
+      url:   https://pads.eigenbaukombinat.de/EBK-Orgatreffen
+      icon: fas fa-book-open
+    - title: Pad EBK-Orgatreffen Archiv
+      url:   https://doku.eigenbaukombinat.de/doku.php?id=mitgliederbereich:protokolle:orgatreffen
+      icon: fas fa-book
+    - title: Pad Holztreffen
+      url: https://pads.eigenbaukombinat.de/Holztreffen
+      icon: fas fa-book-open
+    - title: Pad Metall
+      url: https://pads.eigenbaukombinat.de/Metall
+      icon: fas fa-book-open
+    - title: Pad Hackspace-Orgatreffen
+      url: https://pads.eigenbaukombinat.de/Hackspace-Orgatreffen
+      icon: fas fa-book-open
+    - title: Pad Fahrradtreffen
+      url: https://pads.eigenbaukombinat.de/Fahrradtreffen
+      icon: fas fa-book-open
+    - title: Pad junghacker
+      url: https://pads.eigenbaukombinat.de/junghacker
+      icon: fas fa-book-open
+    - title: Pad Keramikwerkstatt
+      url: https://pads.eigenbaukombinat.de/Keramikwerkstatt
+      icon: fas fa-book-open
+    - title: Pad Sieb-Druck-Keramik-Treffen
+      url:  https://pads.eigenbaukombinat.de/Sieb-Druck-Keramik-Treffen
+      icon: fas fa-book-open
+    - title: Pad Siebdruck
+      url: https://pads.eigenbaukombinat.de/Siebdruck
+      icon: fas fa-book-open
+    - title: Pad AudioVideo
+      url: https://pads.eigenbaukombinat.de/AudioVideo
+      icon: fas fa-book-open
+    - title: Pad heyalter
+      url: htttps://pads.eigenbaukombinat.de/heyalter
+      icon: fas fa-book-open
+    - title: Pad EBK-Metapad
+      url: https://pads.eigenbaukombinat.de/Eigenbaukombinat
+      icon: fas fa-book-open
+
+
+- group: Admin Services
+  items:
+    - title: CheckMK<br>internal Monitoring
+      url: https://moni.eigenbaukombinat.de/EBK
+      icon: fas fa-check
+    - title: Uptimerobot<br>external Monitoring
+      url: https://stats.uptimerobot.com/N10ZzHN80N
+      icon: fas fa-robot
+    - title: Space-API-Endpunkt 
+      url: https://spaceapi.eigenbaukombinat.de/
+      icon: fas fa-server
+    - title: Kalender-API-Endpunkt
+      url: https://kalender.eigenbaukombinat.de/json/
+      icon: fas fa-server
+    - title: Kalendereintrag hinzufügen
+      url: https://kalender.eigenbaukombinat.de/add
+      icon: far fa-calendar-plus
+    - title: NodeRed Spacesteuerung<br>intern
+      url: https://codered.eigenbaukombinat.de/
+      icon: fab fa-node
+    - title: Grafana Dashboard<br>intern
+      url: http://grafana.lan
+      icon: fas fa-chart-area
+    - title: Matrix Föderation Tester
+      url: https://federationtester.matrix.org/#matrix.eigenbaukombinat.de
+      icon: fas fa-compass
+
diff --git a/layouts/index.html b/layouts/index.html
new file mode 100644
index 0000000..8b114cd
--- /dev/null
+++ b/layouts/index.html
@@ -0,0 +1,69 @@
+{{ define "main" }}
+
+<h1 class="welcomeText">{{ .Site.Params.welcomeText }}</h1>
+
+{{ if .Site.Params.searchEngines }}
+    {{ range .Site.Params.searchEngines }}
+        {{ if .activated }}
+            <form id="search-form-{{ .name }}" class="mb-3" action="{{ .url }}" method="get">
+                <input id="search-bar-{{ .name }}" class="form-control" type="text" autofocus type="text" placeholder="Search {{ .name }}" name="{{ cond (isset . "searchkey") .searchkey "q" }}" alt="Search {{ .name }}" onkeydown="if(event.keyCode === 13) { this.form.submit(); return false; }">
+            </form>
+        {{ end }}
+    {{ end }}
+{{ end }}
+
+{{ if .Site.Params.startPageColumns }}
+    <div id="groupList" class="card-deck mt-3">
+        {{ range .Site.Data.links }}
+            <div id="groupListEntry" class="card">
+                <div class="card-body">
+                    <h5 class="card-title groupTitle">{{ .group }}</h5>                        
+                    <ul class="list-group list-group-flush groupListList">
+                        {{ range .items }}
+                            <li class="list-group-item groupListListItem"><a href="{{ .url }}" target="_blank" class="groupLink"><i class="{{ .icon }}"></i>&nbsp;<span class="groupText">{{ .title | safeHTML }}</span></a></li>
+                        {{ end }}
+                    </ul>
+                </div>
+            </div>
+        {{ end }}
+    </div>
+    <div id="groupList" class="card-deck mt-3">
+        {{ range .Site.Data.links2 }}
+            <div id="groupListEntry" class="card">
+                <div class="card-body">
+                    <h5 class="card-title groupTitle">{{ .group }}</h5>                        
+                    <ul class="list-group list-group-flush groupListList">
+                        {{ range .items }}
+                            <li class="list-group-item groupListListItem"><a href="{{ .url }}" target="_blank" class="groupLink"><i class="{{ .icon }}"></i>&nbsp;<span class="groupText">{{ .title | safeHTML }}</span></a></li>
+                        {{ end }}
+                    </ul>
+                </div>
+            </div>
+        {{ end }}
+    </div>
+{{ else }}
+    <div id="iconList" class="card-columns mt-3">
+        {{ range .Site.Data.links }}
+            {{ range .items }}
+                <div id="iconListEntry" class="card">
+                    <div class="card-body cursorPointer" onclick="location.href = '{{ .url }}'">
+                        <p class="card-text"><a href="{{ .url }}" target="_blank" class="iconLink"><i class="fa-5x {{ .icon }}"></i></a></p>
+                        <p class="card-text"><a href="{{ .url }}" target="_blank" class="iconLink">{{ .title | safeHTML }}</a></p>
+                    </div>
+                </div>
+            {{ end }}
+        {{ end }}
+        {{ range .Site.Data.links2 }}
+            {{ range .items }}
+                <div id="iconListEntry" class="card">
+                    <div class="card-body cursorPointer" onclick="location.href = '{{ .url }}'">
+                        <p class="card-text"><a href="{{ .url }}" target="_blank" class="iconLink"><i class="fa-5x {{ .icon }}"></i></a></p>
+                        <p class="card-text"><a href="{{ .url }}" target="_blank" class="iconLink">{{ .title | safeHTML }}</a></p>
+                    </div>
+                </div>
+            {{ end }}
+        {{ end }}
+    </div>
+{{ end }}
+
+{{ end }}