diff --git a/flightscore/src/components/footer-bar.ts b/flightscore/src/components/footer-bar.ts
index 043c6f4..09ca319 100644
--- a/flightscore/src/components/footer-bar.ts
+++ b/flightscore/src/components/footer-bar.ts
@@ -1,6 +1,7 @@
 import { LitElement, html, css, unsafeCSS } from 'lit';
 import { customElement } from 'lit/decorators.js';
 import styles from './footer-bar.css?inline';
+import './ui-link';
 
 @customElement('footer-bar')
 export class FooterBar extends LitElement {
@@ -12,9 +13,9 @@ export class FooterBar extends LitElement {
     return html`
       <footer>
         <div class="center">
-          <a href="/privacy" @click=${(e: Event) => e.preventDefault()}>Privacy</a>
-          <a href="/imprint" @click=${(e: Event) => e.preventDefault()}>Imprint</a>
-          <a href="/contact" @click=${(e: Event) => e.preventDefault()}>Contact</a>
+          <ui-link href="/privacy">Privacy</ui-link>
+          <ui-link href="/imprint">Imprint</ui-link>
+          <ui-link href="/contact">Contact</ui-link>
         </div>
         <div class="right">
           <span>© ${year} Jan Meinl</span>
diff --git a/flightscore/src/components/nav-bar.ts b/flightscore/src/components/nav-bar.ts
index 6a77c32..e2b6e5d 100644
--- a/flightscore/src/components/nav-bar.ts
+++ b/flightscore/src/components/nav-bar.ts
@@ -1,52 +1,47 @@
 import { LitElement, html, css, unsafeCSS } from 'lit';
 import { customElement, state } from 'lit/decorators.js';
 import styles from './nav-bar.css?inline';
+import './ui-link';
 
 @customElement('nav-bar')
 export class NavBar extends LitElement {
-    static styles = css`${unsafeCSS(styles)}`;
+  static styles = css`${unsafeCSS(styles)}`;
 
-    @state() theme: 'light' | 'dark' =
-        (localStorage.getItem('theme') as 'light' | 'dark') ||
-        (window.matchMedia('(prefers-color-scheme: dark)').matches
-            ? 'dark'
-            : 'light');
+  @state() theme: 'light' | 'dark' =
+    (localStorage.getItem('theme') as 'light' | 'dark') ||
+    (window.matchMedia('(prefers-color-scheme: dark)').matches
+      ? 'dark'
+      : 'light');
 
-    firstUpdated() {
-        document.documentElement.setAttribute('data-theme', this.theme);
-    }
+  firstUpdated() {
+    document.documentElement.setAttribute('data-theme', this.theme);
+  }
 
-    toggleTheme() {
-        this.theme = this.theme === 'light' ? 'dark' : 'light';
-        document.documentElement.setAttribute('data-theme', this.theme);
-        localStorage.setItem('theme', this.theme);
-    }
+  toggleTheme() {
+    this.theme = this.theme === 'light' ? 'dark' : 'light';
+    document.documentElement.setAttribute('data-theme', this.theme);
+    localStorage.setItem('theme', this.theme);
+  }
 
-    navigate(path: string) {
-        this.dispatchEvent(
-            new CustomEvent('nav', { detail: { path }, bubbles: true, composed: true })
-        );
-    }
+  navigate(path: string) {
+    this.dispatchEvent(
+      new CustomEvent('nav', { detail: { path }, bubbles: true, composed: true })
+    );
+  }
 
-    render() {
-        return html`
+  render() {
+    return html`
       <nav>
         <div class="brand"><img src="/logo.svg" alt="Flight Score Logo" /> FlightScore</div>
         <div class="links">
-          <a href="/" @click=${(e: Event) => (e.preventDefault(), this.navigate('/'))}>
-            Home
-          </a>
-          <a
-            href="/competitions"
-            @click=${(e: Event) => (e.preventDefault(), this.navigate('/competitions'))}
-          >
-            Competitions
-          </a>
+          <ui-link href="/">Home</ui-link>
+          <ui-link href="/competitions">Competitions</ui-link>
+      
           <button @click=${this.toggleTheme}>
             ${this.theme === 'light' ? '🌙 Dark' : '☀️ Light'}
           </button>
         </div>
       </nav>
     `;
-    }
+  }
 }
\ No newline at end of file
diff --git a/flightscore/src/components/ui-link.css b/flightscore/src/components/ui-link.css
new file mode 100644
index 0000000..b9253d7
--- /dev/null
+++ b/flightscore/src/components/ui-link.css
@@ -0,0 +1,28 @@
+a {
+  position: relative;
+  color: var(--color-text);
+  font-weight: 500;
+  text-decoration: none;
+  transition: color 0.25s ease;
+  display: inline-block;
+}
+
+a::after {
+  content: '';
+  position: absolute;
+  left: 0;
+  bottom: -2px;
+  width: 0%;
+  height: 2px;
+  background: var(--color-accent);
+  transition: width 0.3s ease;
+}
+
+a:hover::after,
+a.active::after {
+  width: 100%;
+}
+
+a.active {
+  color: var(--color-accent);
+}
\ No newline at end of file
diff --git a/flightscore/src/components/ui-link.ts b/flightscore/src/components/ui-link.ts
new file mode 100644
index 0000000..f01410a
--- /dev/null
+++ b/flightscore/src/components/ui-link.ts
@@ -0,0 +1,34 @@
+import { LitElement, html, css, unsafeCSS } from 'lit';
+import { customElement, property } from 'lit/decorators.js';
+import styles from './ui-link.css?inline';
+
+@customElement('ui-link')
+export class UiLink extends LitElement {
+  static styles = css`${unsafeCSS(styles)}`;
+
+  @property() href = '/';
+  @property({ type: Boolean }) active = false;
+
+  navigate(e: Event) {
+    e.preventDefault();
+    this.dispatchEvent(
+      new CustomEvent('nav', {
+        detail: { path: this.href },
+        bubbles: true,
+        composed: true,
+      })
+    );
+  }
+
+  render() {
+    return html`
+      <a
+        href=${this.href}
+        class=${this.active ? 'active' : ''}
+        @click=${this.navigate}
+      >
+        <slot></slot>
+      </a>
+    `;
+  }
+}
\ No newline at end of file
diff --git a/flightscore/src/pages/not-found-page.ts b/flightscore/src/pages/not-found-page.ts
index ef10922..0a435d6 100644
--- a/flightscore/src/pages/not-found-page.ts
+++ b/flightscore/src/pages/not-found-page.ts
@@ -1,12 +1,31 @@
-import { LitElement, html } from 'lit';
+import { LitElement, html, css } from 'lit';
 import { customElement } from 'lit/decorators.js';
 
 @customElement('not-found-page')
 export class NotFoundPage extends LitElement {
+  static styles = css`
+    div {
+      padding-top: 4rem;
+      * {
+        width: fit-content;
+        margin: auto auto;
+        padding-bottom: 1rem;
+      }
+    }
+  `;
+
+  navigate(path: string) {
+        this.dispatchEvent(
+            new CustomEvent('nav', { detail: { path }, bubbles: true, composed: true })
+        );
+    }
+
   render() {
     return html`
-      <h1>404 Not Found</h1>
-      <p>How did you get here?</p>
+      <div>
+        <h1>404 Not Found</h1>
+        <p><ui-link href="/">Here</ui-link>you can get back.</p>
+      </div>
     `;
   }
 }
\ No newline at end of file