diff --git a/assets/sass/form.scss b/assets/sass/form.scss
new file mode 100644
index 00000000..4cacb09e
--- /dev/null
+++ b/assets/sass/form.scss
@@ -0,0 +1,20 @@
+.m-form {
+  margin-bottom: 1.6rem;
+
+  .row>* {
+    padding: 0;
+  }
+
+  input[type=text], input[type=email], select, textarea {
+    width: 100%;
+    margin-bottom: 1.6rem;
+
+    @include media-breakpoint-up(md) {
+      width: 50%;
+    }
+  }
+  input[type=submit] {
+    width: auto;
+    padding: 0 1rem;
+  }
+}
\ No newline at end of file
diff --git a/assets/sass/main.scss b/assets/sass/main.scss
index 13f532e6..8c9aa153 100644
--- a/assets/sass/main.scss
+++ b/assets/sass/main.scss
@@ -1,5 +1,6 @@
 @import "_variables.scss";
 @import "node_modules/bootstrap/scss/bootstrap.scss";
+@import 'node_modules/@material-design-icons/font/round.scss';
 @import "styles.scss";
 @import "fonts.scss";
 @import "navigation.scss";
@@ -9,4 +10,4 @@
 @import "content.scss";
 @import "textHighlight.scss";
 @import "headings.scss";
-@import 'node_modules/@material-design-icons/font/round.scss';
\ No newline at end of file
+@import "form.scss";
\ No newline at end of file
diff --git a/content/contact.de.html b/content/contact.de.html
index 74200c61..20621fab 100644
--- a/content/contact.de.html
+++ b/content/contact.de.html
@@ -3,21 +3,30 @@
 layout: "common"
 ---
 
-<form action="https://api.web3forms.com/submit" method="POST">
+<form action="https://api.web3forms.com/submit" method="POST" class="m-form container">
     <input type="hidden" name="access_key" value="29293094-c9cc-48b7-9ff6-31b42534e211">
     <input type="hidden" name="from_name" value="FIPGuide">
     <input type="hidden" name="subject" value="New Message from FIPGuide">
-    <input type="hidden" name="redirect" value="{{< ref "success" >}}">
+    <input type="hidden" name="redirect" value='{{< ref "success" >}}'>
 
-    <label for="name">Name:</label><br>
-    <input type="text" id="name" name="name" required><br><br>
-    
-    <label for="email">Email:</label><br>
-    <input type="email" id="email" name="email" required><br><br>
-    
-    <label for="message">Message:</label><br>
-    <textarea id="message" name="message" rows="4" cols="50" required></textarea><br><br>
-    <input type="submit" value="Submit">
+    <div class="row">
+        <label for="name">Name:</label>
+        <input type="text" id="name" name="name" required>
+    </div>
+
+    <div class="row">
+        <label for="email">Email:</label>
+        <input type="email" id="email" name="email" required>
+    </div>
+
+    <div class="row">
+        <label for="message">Message:</label>
+        <textarea id="message" name="message" rows="4" cols="50" required></textarea>
+    </div>
+
+    <div class="row">
+        <input type="submit" value="Submit">
+    </div>
 </form>
 
-Oder schreibe uns eine Mail: nextstop@fipguide.org
+Oder schreibe uns eine Mail: <a href="mailto:nextstop@fipguide.org">nextstop@fipguide.org</a>
diff --git a/content/news/2/image.webp b/content/news/2/image.webp
index e16a69c0..b8e75adc 100644
Binary files a/content/news/2/image.webp and b/content/news/2/image.webp differ
diff --git a/content/news/2/index.de.md b/content/news/2/index.de.md
index ed94acb7..8c02a12b 100644
--- a/content/news/2/index.de.md
+++ b/content/news/2/index.de.md
@@ -19,5 +19,3 @@ Ohne Freifahrt, aber mit FIP 50, lassen sich ebenfalls grenzüberschreitende Tic
 Darüber hinaus können auch "100% Ermäßigung Niederlande" und "Freifahrtschein Luxemburg (CFL)" angegeben werden und auch mehrere Ermäßigungen kombiniert werden, beispielsweise auch noch mit einer BahnCard. Damit lassen sich hier viele kombinierte vergünstigte FIP-Fahrten buchen.
 
 Schreibt uns gerne über unser Kontaktformular, wenn ihr Erfahrungen mit den Vergünstigungen über die Website gemacht habt.
-
-![SNCB Logo](./image.webp)
diff --git a/content/news/2/index.en.md b/content/news/2/index.en.md
index cb58c547..89a1abae 100644
--- a/content/news/2/index.en.md
+++ b/content/news/2/index.en.md
@@ -20,5 +20,3 @@ In addition, "100% discount Netherlands" and "Free travel pass Luxembourg (CFL)"
 
 Feel free to write to us via our contact form if you have any experiences with the discounts on the website.
 
-![SNCB Logo](./image.webp)
-
diff --git a/content/news/4/index.de.md b/content/news/4/index.de.md
index 6c691b39..e7ab188f 100644
--- a/content/news/4/index.de.md
+++ b/content/news/4/index.de.md
@@ -13,6 +13,4 @@ Das litauische Schienennetz umfasst ca. 1.900 Kilometer und ist breitspurig (1.5
 
 Mit dem Beitritt zur FIP setzt LTG ein Zeichen für die Integration in das internationale Bahnnetz und stärkt zugleich die Attraktivität der Schiene als nachhaltiges Verkehrsmittel.
 
-Informationen zur Nutzung von Fahrvergünstigungen mit FIP in Litauen sind in Kürze hier auf der Seite zu finden.
-
-![LTG Link Logo](./image.webp)
\ No newline at end of file
+Informationen zur Nutzung von Fahrvergünstigungen mit FIP in Litauen sind in Kürze hier auf der Seite zu finden.
\ No newline at end of file
diff --git a/content/news/4/index.en.md b/content/news/4/index.en.md
index d5094733..88e9d910 100644
--- a/content/news/4/index.en.md
+++ b/content/news/4/index.en.md
@@ -13,6 +13,4 @@ The Lithuanian rail network covers approximately 1,900 kilometers and is broad-g
 
 By joining FIP, LTG is signaling its integration into the international rail network and at the same time strengthening the attractiveness of rail as a sustainable mode of transport.
 
-Information on the use of travel discounts with FIP in Lithuania will be available here on the site shortly.
-
-![LTG Link Logo](./image.webp)
\ No newline at end of file
+Information on the use of travel discounts with FIP in Lithuania will be available here on the site shortly.
\ No newline at end of file
diff --git a/layouts/_default/home.html b/layouts/_default/home.html
index ac674763..ac2f320a 100644
--- a/layouts/_default/home.html
+++ b/layouts/_default/home.html
@@ -12,4 +12,4 @@ <h2>Die neuesten Neuigkeiten 🔥</h2>
           {{ end }}
       </div>
   </section>
-{{ end }}
+{{ end }}
\ No newline at end of file
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 93841427..33a33a5b 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,6 +1,6 @@
 {{ define "main" }}
   <div class="container">
-    <h1 data-pagefind-meta="title">{{ .Title }}</h1>
+    <h2 data-pagefind-meta="title">{{ .Title }}</h2>
     {{ .Content }} {{ range .Pages }}
     <div class="m-teaser">
       <a href="{{ .RelPermalink }}">
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 8959a88d..58b6ef4f 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,12 +1,15 @@
 {{ define "main" }}
 <article class="container">
-    <h1 data-pagefind-meta="title">{{ .Title }}</h1>
+    <h2 data-pagefind-meta="title">{{ .Title }}</h2>
 
     {{ $dateMachine := .Date | time.Format "2006-01-02T15:04:05-07:00" }}
     {{ $dateHuman := .Date | time.Format ":date_long" }}
+
+    {{ if .Date }}
     <div class="updateDate">
         <time datetime="{{ $dateMachine }}">Zuletzt aktualisiert: {{ $dateHuman }}</time>
     </div>
+    {{ end }}
 
     <div class="content">
         {{ .Content }}
diff --git a/layouts/common/single.html b/layouts/common/single.html
deleted file mode 100644
index 6dca600c..00000000
--- a/layouts/common/single.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{{ define "main" }}
-<div class="container">
-    <h1>{{ .Title }}</h1>
-    <br>
-    {{ .Content }}
-    {{ $related := .Site.RegularPages.RelatedIndices . "country" }}
-    {{ with $related }}
-        <h3>See Also</h3>
-        <ul>
-        {{ range . }}
-            <li><a href="{{ .RelPermalink }}">{{ .LinkTitle }}</a></li>
-        {{ end }}
-        </ul>
-    {{ end }}
-    {{ partial "terms.html" (dict "taxonomy" "tags" "page" .) }}
-</div>
-{{ end }}
diff --git a/layouts/country/single.html b/layouts/country/single.html
index d0e5c854..09c7c5fa 100644
--- a/layouts/country/single.html
+++ b/layouts/country/single.html
@@ -1,6 +1,6 @@
 {{ define "main" }}
 <article class="container">
-    <h1 data-pagefind-meta="title">{{ .Title }}</h1>
+    <h2 data-pagefind-meta="title">{{ .Title }}</h2>
 
     {{ $dateMachine := .Date | time.Format "2006-01-02T15:04:05-07:00" }}
     {{ $dateHuman := .Date | time.Format ":date_long" }}
diff --git a/layouts/operator/single.html b/layouts/operator/single.html
index c498ba51..19a1905d 100644
--- a/layouts/operator/single.html
+++ b/layouts/operator/single.html
@@ -1,6 +1,6 @@
 {{ define "main" }}
 <article class="container">
-    <h1 data-pagefind-meta="title">{{ .Title }}</h1>
+    <h2 data-pagefind-meta="title">{{ .Title }}</h2>
 
     {{ $dateMachine := .Date | time.Format "2006-01-02T15:04:05-07:00" }}
     {{ $dateHuman := .Date | time.Format ":date_long" }}
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index c3491e8a..cfd0bf29 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -9,9 +9,11 @@
 {{ partialCached "head/js.html" . }}
 {{ $options := (dict "targetPath" "css/styles.css" "outputStyle" "compressed") }}
 {{ $style := resources.Get "sass/main.scss" | toCSS $options | minify }}
-<link rel="stylesheet" href="{{ $style.RelPermalink }}" media="screen" />
+<link rel="stylesheet" href="{{ $style.RelPermalink }}" media="screen" rel="preload" as="style" />
+{{ if .IsHome }}
 <link rel="stylesheet" href="/pagefind/pagefind-ui.css">
-<script src="/pagefind/pagefind-ui.js"></script>
+<script src="/pagefind/pagefind-ui.js" defer></script>
+{{ end }}
 
 <!-- include a favicon for your site if you have it, else omit the line below 
      Location of favicon can be in mytheme/static/favicon.ico -->
diff --git a/layouts/partials/head/js.html b/layouts/partials/head/js.html
index ccf763b5..e334a0dd 100644
--- a/layouts/partials/head/js.html
+++ b/layouts/partials/head/js.html
@@ -9,10 +9,4 @@
   crossorigin="anonymous"
 ></script>
 {{- end }} {{- end }}
-<!-- JavaScript and dependencies -->
-
-{{ $bootstrap := resources.Get "js/bootstrap.bundle.min.js" }} {{ $js := slice
-$bootstrap | resources.Concat "js/bundle.js" | resources.Minify }}
-
-<script src="{{$js.RelPermalink}}" defer></script>
 {{- end }}
diff --git a/layouts/partials/image.html b/layouts/partials/image.html
index cc8ad1e6..3e1d7d4a 100644
--- a/layouts/partials/image.html
+++ b/layouts/partials/image.html
@@ -1,34 +1,45 @@
+{{ $image := . }}
+{{ $loadingLazy := true }}
 {{ $myTitle := "" }}
+
+{{ if .Permalink }}
+{{ $image = . }}
+{{ else if .image }}
+{{ $image = .image }}
+{{ $loadingLazy = .loadingLazy | default true }}
+{{ $myTitle = .myTitle | default "" }}
+{{ end }}
+
 <picture>
-  {{ $width := .Width }}
+  {{ $width := $image.Width }}
 
   {{ if gt $width 2200 }}
-      {{ with .Resize "2200x" }}
-          <source media="(min-width:2200px)" srcset="{{ .RelPermalink | safeURL }}" title="{{ $myTitle }}" loading="lazy"/>
-      {{ end }}
+  {{ with $image.Resize "2200x" }}
+  <source media="(min-width:2200px)" srcset="{{ .RelPermalink | safeURL }}" title="{{ $myTitle }}" loading="{{ if $loadingLazy }}lazy{{ else }}eager{{ end }}"/>
+  {{ end }}
   {{ end }}
 
   {{ if gt $width 1500 }}
-      {{ with .Resize "1500x" }}
-          <source media="(min-width:1500px)" srcset="{{ .RelPermalink | safeURL }}" title="{{ $myTitle }}" loading="lazy"/>
-      {{ end }}
+  {{ with $image.Resize "1500x" }}
+  <source media="(min-width:1500px)" srcset="{{ .RelPermalink | safeURL }}" title="{{ $myTitle }}" loading="{{ if $loadingLazy }}lazy{{ else }}eager{{ end }}"/>
+  {{ end }}
   {{ end }}
 
   {{ if gt $width 1200 }}
-      {{ with .Resize "1200x" }}
-          <source media="(min-width:1200px)" srcset="{{ .RelPermalink | safeURL }}" title="{{ $myTitle }}" loading="lazy"/>
-      {{ end }}
+  {{ with $image.Resize "1200x" }}
+  <source media="(min-width:1200px)" srcset="{{ .RelPermalink | safeURL }}" title="{{ $myTitle }}" loading="{{ if $loadingLazy }}lazy{{ else }}eager{{ end }}"/>
+  {{ end }}
   {{ end }}
 
   {{ if gt $width 800 }}
-      {{ with .Resize "800x" }}
-          <source media="(min-width:800px)" srcset="{{ .RelPermalink | safeURL }}" title="{{ $myTitle }}" loading="lazy"/>
-      {{ end }}
+  {{ with $image.Resize "800x" }}
+  <source media="(min-width:800px)" srcset="{{ .RelPermalink | safeURL }}" title="{{ $myTitle }}" loading="{{ if $loadingLazy }}lazy{{ else }}eager{{ end }}"/>
+  {{ end }}
   {{ end }}
 
-  {{ $tinyImage :=  . }}
+  {{ $tinyImage := $image }}
   {{ if gt $width 500 }}
-      {{ $tinyImage = .Resize "500x" }}
+  {{ $tinyImage = $image.Resize "500x" }}
   {{ end }}
-  <img src="{{ $tinyImage.RelPermalink | safeURL }}" alt="{{ $myTitle }}" title="{{ $myTitle }}" loading="lazy"/>
-</picture>
+  <img src="{{ $tinyImage.RelPermalink | safeURL }}" alt="{{ $myTitle }}" title="{{ $myTitle }}" loading="{{ if $loadingLazy }}lazy{{ else }}eager{{ end }}"/>
+</picture>
\ No newline at end of file
diff --git a/layouts/partials/stage.html b/layouts/partials/stage.html
index b71f0261..34c77b54 100644
--- a/layouts/partials/stage.html
+++ b/layouts/partials/stage.html
@@ -3,14 +3,9 @@
     new PagefindUI({ element: "#search", highlightParam: "highlight", showSubResults: true });
   });
 </script>
-<!-- include the highlight script -->
-<script type="module">
-  await import('/pagefind/pagefind-highlight.js');
-  new PagefindHighlight({ highlightParam: "highlight" });
-</script>
 
 <section class="o-stage container-fluid">
   {{ $image := resources.Get "images/startpage.webp" }}
-  {{ partial "image.html" $image }}
+  {{ partial "image.html" (dict "image" $image "loadingLazy" false) }}
   <div id="search" class="o-stage__search"></div>
 </section>
\ No newline at end of file