diff --git a/gymboard-api/src/main/java/nl/andrewlalis/gymboard_api/config/WebConfig.java b/gymboard-api/src/main/java/nl/andrewlalis/gymboard_api/config/WebConfig.java
index e1bbd40..1f9e99a 100644
--- a/gymboard-api/src/main/java/nl/andrewlalis/gymboard_api/config/WebConfig.java
+++ b/gymboard-api/src/main/java/nl/andrewlalis/gymboard_api/config/WebConfig.java
@@ -13,13 +13,15 @@ import java.util.Arrays;
 
 @Configuration
 public class WebConfig {
+	@Value("${app.web-origin}")
+	private String webOrigin;
+
 	@Bean
 	public CorsFilter corsFilter() {
 		final UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
 		final CorsConfiguration config = new CorsConfiguration();
 		config.setAllowCredentials(true);
-		// Don't do this in production, use a proper list  of allowed origins
-		config.addAllowedOriginPattern("*");
+		config.addAllowedOriginPattern(webOrigin);
 		config.setAllowedHeaders(Arrays.asList("Origin", "Content-Type", "Accept"));
 		config.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "OPTIONS", "DELETE", "PATCH"));
 		source.registerCorsConfiguration("/**", config);
diff --git a/gymboard-api/src/main/resources/application-development.properties b/gymboard-api/src/main/resources/application-development.properties
index 13bdea4..c4704b4 100644
--- a/gymboard-api/src/main/resources/application-development.properties
+++ b/gymboard-api/src/main/resources/application-development.properties
@@ -8,3 +8,5 @@ spring.jpa.show-sql=false
 
 spring.task.execution.pool.core-size=3
 spring.task.execution.pool.max-size=10
+
+app.web-origin=http://localhost:9000
diff --git a/gymboard-app/src/i18n/de/index.ts b/gymboard-app/src/i18n/de/index.ts
new file mode 100644
index 0000000..c607264
--- /dev/null
+++ b/gymboard-app/src/i18n/de/index.ts
@@ -0,0 +1,28 @@
+export default {
+    mainLayout: {
+      language: 'Sprache',
+      pages: 'Seiten',
+    },
+    indexPage: {
+      searchHint: 'Suche nach einem Gym',
+    },
+    gymPage: {
+      home: 'Home',
+      submit: 'Einreichen',
+      leaderboard: 'Bestenliste',
+      homePage: {
+        overview: 'Überblick über dieses Fitnessstudio:',
+        recentLifts: 'Letzten Aufzüge'
+      },
+      submitPage: {
+        name: 'Dein Name',
+        exercise: 'Übung',
+        weight: 'Gewicht',
+        reps: 'Wiederholungen',
+        date: 'Datum',
+        upload: 'Videodatei zum Hochladen',
+        submit: 'Einreichen',
+      },
+    },
+  };
+  
\ No newline at end of file
diff --git a/gymboard-app/src/i18n/index.ts b/gymboard-app/src/i18n/index.ts
index 1c28ddf..00df65a 100644
--- a/gymboard-app/src/i18n/index.ts
+++ b/gymboard-app/src/i18n/index.ts
@@ -1,7 +1,9 @@
 import enUS from './en-US';
 import nlNL from './nl-NL';
+import de from './de';
 
 export default {
   'en-US': enUS,
   'nl-NL': nlNL,
+  'de': de,
 };
diff --git a/gymboard-app/src/layouts/MainLayout.vue b/gymboard-app/src/layouts/MainLayout.vue
index 6864950..0c3f58c 100644
--- a/gymboard-app/src/layouts/MainLayout.vue
+++ b/gymboard-app/src/layouts/MainLayout.vue
@@ -41,8 +41,9 @@
         <q-item-label header>
           {{ $t('mainLayout.pages') }}
         </q-item-label>
-        <q-item clickable>Gyms</q-item>
+        <q-item clickable to="/">Gyms</q-item>
         <q-item clickable>Global Leaderboard</q-item>
+        <q-item clickable to="/about">About</q-item>
       </q-list>
     </q-drawer>
 
@@ -60,6 +61,7 @@ const i18n = useI18n({ useScope: 'global' });
 const localeOptions = [
   { value: 'en-US', label: 'English' },
   { value: 'nl-NL', label: 'Nederlands' },
+  { value: 'de', label: 'Deutsch' },
 ];
 
 const leftDrawerOpen = ref(false);
diff --git a/gymboard-app/src/pages/AboutPage.vue b/gymboard-app/src/pages/AboutPage.vue
new file mode 100644
index 0000000..4ef74c1
--- /dev/null
+++ b/gymboard-app/src/pages/AboutPage.vue
@@ -0,0 +1,11 @@
+<template>
+  <StandardCenteredPage>
+    <h3 class="text-center">About Gymboard</h3>
+    <p>
+      Lorem ipsum, dolor sit amet consectetur adipisicing elit. Error fugit quia laboriosam eaque? Deserunt, accusantium dicta assumenda debitis incidunt eius provident magnam, est quasi officia voluptas, nam neque omnis reiciendis.
+    </p>
+  </StandardCenteredPage>
+</template>
+<script setup lang="ts">
+import StandardCenteredPage from 'src/components/StandardCenteredPage.vue';
+</script>
diff --git a/gymboard-app/src/pages/ErrorNotFound.vue b/gymboard-app/src/pages/ErrorNotFound.vue
index e93c6a3..bf3714a 100644
--- a/gymboard-app/src/pages/ErrorNotFound.vue
+++ b/gymboard-app/src/pages/ErrorNotFound.vue
@@ -1,16 +1,14 @@
 <template>
   <div
-    class="fullscreen bg-blue text-white text-center q-pa-md flex flex-center"
+    class="fullscreen text-center q-pa-md flex flex-center"
   >
     <div>
       <div style="font-size: 30vh">404</div>
 
-      <div class="text-h2" style="opacity: 0.4">Oops. Nothing here...</div>
+      <div class="text-h2" style="opacity: 0.4">Page not found.</div>
 
       <q-btn
         class="q-mt-xl"
-        color="white"
-        text-color="blue"
         unelevated
         to="/"
         label="Go Home"
diff --git a/gymboard-app/src/router/routes.ts b/gymboard-app/src/router/routes.ts
index b77e582..d413134 100644
--- a/gymboard-app/src/router/routes.ts
+++ b/gymboard-app/src/router/routes.ts
@@ -1,6 +1,7 @@
 import { RouteRecordRaw } from 'vue-router';
 import MainLayout from 'layouts/MainLayout.vue';
 import IndexPage from 'pages/IndexPage.vue';
+import AboutPage from 'pages/AboutPage.vue';
 import GymPage from 'pages/gym/GymPage.vue';
 import GymSubmissionPage from 'pages/gym/GymSubmissionPage.vue';
 import GymHomePage from 'pages/gym/GymHomePage.vue';
@@ -21,6 +22,7 @@ const routes: RouteRecordRaw[] = [
           { path: 'leaderboard', component: GymLeaderboardsPage },
         ],
       },
+      { path: 'about', component: AboutPage }
     ],
   },
 
diff --git a/gymboard-search/src/main/java/nl/andrewlalis/gymboardsearch/config/WebConfig.java b/gymboard-search/src/main/java/nl/andrewlalis/gymboardsearch/config/WebConfig.java
index d61c7c4..0a5e374 100644
--- a/gymboard-search/src/main/java/nl/andrewlalis/gymboardsearch/config/WebConfig.java
+++ b/gymboard-search/src/main/java/nl/andrewlalis/gymboardsearch/config/WebConfig.java
@@ -1,7 +1,9 @@
 package nl.andrewlalis.gymboardsearch.config;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.env.Environment;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 import org.springframework.web.filter.CorsFilter;
@@ -10,14 +12,15 @@ import java.util.Arrays;
 
 @Configuration
 public class WebConfig {
+	@Value("${app.web-origin}")
+	private String webOrigin;
 
 	@Bean
 	public CorsFilter corsFilter() {
 		final UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
 		final CorsConfiguration config = new CorsConfiguration();
 		config.setAllowCredentials(true);
-		// Don't do this in production, use a proper list  of allowed origins
-		config.addAllowedOriginPattern("*");
+		config.addAllowedOriginPattern(webOrigin);
 		config.setAllowedHeaders(Arrays.asList("Origin", "Content-Type", "Accept"));
 		config.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "OPTIONS", "DELETE", "PATCH"));
 		source.registerCorsConfiguration("/**", config);
diff --git a/gymboard-search/src/main/resources/application-development.properties b/gymboard-search/src/main/resources/application-development.properties
index 4d360de..2a200e5 100644
--- a/gymboard-search/src/main/resources/application-development.properties
+++ b/gymboard-search/src/main/resources/application-development.properties
@@ -1 +1,2 @@
 server.port=8081
+app.web-origin=http://localhost:9000