diff --git a/NavCityBreda/Helpers/Settings.cs b/NavCityBreda/Helpers/Settings.cs
index 77b19d4..2bfd420 100644
--- a/NavCityBreda/Helpers/Settings.cs
+++ b/NavCityBreda/Helpers/Settings.cs
@@ -17,16 +17,11 @@ namespace NavCityBreda.Helpers
             //Define default settings here
         }
 
-        public static string Language
+        public static async void ChangeLanguage(string lang)
         {
-            get
-            {
-                return "";
-            }
-            set
-            {
-                ApplicationLanguages.PrimaryLanguageOverride = value;
-            }
+                ApplicationLanguages.PrimaryLanguageOverride = lang;
+                await Task.Delay(TimeSpan.FromMilliseconds(100));
+                App.rootFrame.Navigate(typeof(MainPage));
         }
     }
 }
diff --git a/NavCityBreda/Languages/de-DE/Resources.resw b/NavCityBreda/Strings/de-DE/Resources.resw
similarity index 90%
rename from NavCityBreda/Languages/de-DE/Resources.resw
rename to NavCityBreda/Strings/de-DE/Resources.resw
index 486f08e..70fa605 100644
--- a/NavCityBreda/Languages/de-DE/Resources.resw
+++ b/NavCityBreda/Strings/de-DE/Resources.resw
@@ -123,4 +123,25 @@
   <data name="MenuItemSettings.Text" xml:space="preserve">
     <value>Einstellungen</value>
   </data>
+  <data name="PageTitleDefault.Text" xml:space="preserve">
+    <value>Wilkommen</value>
+  </data>
+  <data name="PageTitleHelp" xml:space="preserve">
+    <value>Hilfe</value>
+  </data>
+  <data name="PageTitleMap" xml:space="preserve">
+    <value>Karte</value>
+  </data>
+  <data name="PageTitleRoute" xml:space="preserve">
+    <value>kut</value>
+  </data>
+  <data name="PageTitleRouteDetail" xml:space="preserve">
+    <value>kut detail</value>
+  </data>
+  <data name="PageTitleSettings" xml:space="preserve">
+    <value>Einstellungen</value>
+  </data>
+  <data name="PageTitleWaypoint" xml:space="preserve">
+    <value>Wegpunkt</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/NavCityBreda/Languages/en-US/Resources.resw b/NavCityBreda/Strings/en-US/Resources.resw
similarity index 100%
rename from NavCityBreda/Languages/en-US/Resources.resw
rename to NavCityBreda/Strings/en-US/Resources.resw
diff --git a/NavCityBreda/Languages/nl-NL/Resources.resw b/NavCityBreda/Strings/nl-NL/Resources.resw
similarity index 100%
rename from NavCityBreda/Languages/nl-NL/Resources.resw
rename to NavCityBreda/Strings/nl-NL/Resources.resw
diff --git a/NavCityBreda/Views/SettingsView.xaml b/NavCityBreda/Views/SettingsView.xaml
index 2f2ed78..fa804fd 100644
--- a/NavCityBreda/Views/SettingsView.xaml
+++ b/NavCityBreda/Views/SettingsView.xaml
@@ -8,6 +8,17 @@
     mc:Ignorable="d">
 
     <Grid>
-        <TextBlock Text="Settings"/>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            
+        </Grid.RowDefinitions>
+        
+        <TextBlock Text="Settings - Add TileMapOption" Grid.Row="0"/>
+        <Button Name="DeutschesKnopfe" Click="DeutschesKnopfe_Click" Content="Deutsch" Grid.Row="1"/>
+        <Button Name="EnglishButton" Click="EnglishButton_Click" Content="English" Grid.Row="2" />
+        <Button Name="NederlandseKnop" Click="NederlandseKnop_Click" Content="Nederlands" Grid.Row="3" />
     </Grid>
 </Page>
diff --git a/NavCityBreda/Views/SettingsView.xaml.cs b/NavCityBreda/Views/SettingsView.xaml.cs
index 6a7971e..f40df3b 100644
--- a/NavCityBreda/Views/SettingsView.xaml.cs
+++ b/NavCityBreda/Views/SettingsView.xaml.cs
@@ -1,4 +1,5 @@
-using System;
+using NavCityBreda.Helpers;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -26,5 +27,20 @@ namespace NavCityBreda.Views
         {
             this.InitializeComponent();
         }
+
+        private void DeutschesKnopfe_Click(object sender, RoutedEventArgs e)
+        {
+            Settings.ChangeLanguage("de-DE");
+        }
+
+        private void EnglishButton_Click(object sender, RoutedEventArgs e)
+        {
+            Settings.ChangeLanguage("en-US");
+        }
+
+        private void NederlandseKnop_Click(object sender, RoutedEventArgs e)
+        {
+            Settings.ChangeLanguage("nl-NL");
+        }
     }
 }