diff --git a/WebContent/gui/OSRM.MainGUI.js b/WebContent/gui/OSRM.MainGUI.js
index 3022d3049..0a95c4ded 100644
--- a/WebContent/gui/OSRM.MainGUI.js
+++ b/WebContent/gui/OSRM.MainGUI.js
@@ -59,6 +59,10 @@ setLabels: function() {
 	document.getElementById("gui-input-source").title = OSRM.loc("GUI_START_TOOLTIP");
 	document.getElementById("gui-input-target").title = OSRM.loc("GUI_END_TOOLTIP");
 	document.getElementById("legal-notice").innerHTML = OSRM.loc("GUI_LEGAL_NOTICE");
+	document.getElementById("gui-mapping-label").innerHTML = OSRM.loc("GUI_MAPPING_TOOLS");
+	document.getElementById("gui-config-label").innerHTML = OSRM.loc("GUI_CONFIGURATION");
+	document.getElementById("gui-language-label").innerHTML = OSRM.loc("GUI_LANGUAGE");
+	document.getElementById("gui-units-label").innerHTML = OSRM.loc("GUI_UNITS");
 },
 
 // clear output area
diff --git a/WebContent/localization/OSRM.Locale.da.js b/WebContent/localization/OSRM.Locale.da.js
index 4725d1f01..bec6ddf7e 100644
--- a/WebContent/localization/OSRM.Locale.da.js
+++ b/WebContent/localization/OSRM.Locale.da.js
@@ -20,19 +20,29 @@ or see http://www.gnu.org/licenses/agpl.txt.
 
 
 OSRM.Localization["da"] = {
+// own language
+"LANGUAGE": "Dansk",
 //gui
-"OPEN_JOSM": "JOSM",
-"OPEN_OSMBUGS": "OSM Fejl",
 "GUI_START": "Start",
 "GUI_END": "Destination",
-"GUI_RESET": "  Nulstil  ",
-"GUI_SEARCH": "  Vis  ",
+"GUI_RESET": "Nulstil",
+"GUI_SEARCH": "Vis",
 "GUI_REVERSE": "Omvendt",
-"GUI_OPTIONS": "Kortlægnings værktøjer",
-"GUI_HIGHLIGHT_UNNAMED_ROADS": "Fremhæv unavngivne veje",
 "GUI_START_TOOLTIP": "Indtast start",
 "GUI_END_TOOLTIP": "Indtast destination",
 "GUI_LEGAL_NOTICE": "GUI2 v"+OSRM.VERSION+" "+OSRM.DATE+" - OSRM hosting af <a href='http://algo2.iti.kit.edu/'>KIT</a> - Geocoder af <a href='http://www.osm.org/'>OSM</a>",
+//config
+"GUI_CONFIGURATION": "Konfiguration",
+"GUI_LANGUAGE": "Sprog",
+"GUI_UNITS": "Enheder",
+"GUI_KILOMETERS": "Kilometer",
+"GUI_MILES": "Miles",
+// mapping
+"GUI_MAPPING_TOOLS": "Kortlægnings værktøjer",
+"GUI_HIGHLIGHT_UNNAMED_ROADS": "Fremhæv unavngivne veje",
+"GUI_SHOW_PREVIOUS_ROUTES": "Vis tidligere ruter",
+"OPEN_JOSM": "JOSM",
+"OPEN_OSMBUGS": "OSM Bugs",
 // geocoder
 "SEARCH_RESULTS": "Søgeresultater",
 "FOUND_X_RESULTS": "fandt %i resultater",
diff --git a/WebContent/localization/OSRM.Locale.de.js b/WebContent/localization/OSRM.Locale.de.js
index b1dde0154..bd28ef88d 100644
--- a/WebContent/localization/OSRM.Locale.de.js
+++ b/WebContent/localization/OSRM.Locale.de.js
@@ -20,19 +20,29 @@ or see http://www.gnu.org/licenses/agpl.txt.
 
 
 OSRM.Localization["de"] = {
+// own language
+"LANGUAGE": "Deutsch",
 //gui
-"OPEN_JOSM": "JOSM",
-"OPEN_OSMBUGS": "OSM Bugs",
 "GUI_START": "Start",
 "GUI_END": "Ziel",
 "GUI_RESET": "Reset",
 "GUI_SEARCH": "Zeigen",
 "GUI_REVERSE": "Umdrehen",
-"GUI_OPTIONS": "Kartenwerkzeuge",
-"GUI_HIGHLIGHT_UNNAMED_ROADS": "Unbenannte Straßen hervorheben",
 "GUI_START_TOOLTIP": "Startposition eingeben",
 "GUI_END_TOOLTIP": "Zielposition eingeben",
 "GUI_LEGAL_NOTICE": "GUI2 v"+OSRM.VERSION+" "+OSRM.DATE+" - OSRM hosting by <a href='http://algo2.iti.kit.edu/'>KIT</a> - Geocoder by <a href='http://www.osm.org/'>OSM</a>",
+//config
+"GUI_CONFIGURATION": "Einstellungen",
+"GUI_LANGUAGE": "Sprache",
+"GUI_UNITS": "Einheiten",
+"GUI_KILOMETERS": "Kilometer",
+"GUI_MILES": "Meilen",
+// mapping
+"GUI_MAPPING_TOOLS": "Kartenwerkzeuge",
+"GUI_HIGHLIGHT_UNNAMED_ROADS": "Unbenannte Straßen hervorheben",
+"GUI_SHOW_PREVIOUS_ROUTES": "Frühere Routen zeigen",
+"OPEN_JOSM": "JOSM",
+"OPEN_OSMBUGS": "OSM Bugs",
 // geocoder
 "SEARCH_RESULTS": "Suchergebnisse",
 "FOUND_X_RESULTS": "%i Ergebnisse gefunden",
diff --git a/WebContent/localization/OSRM.Locale.en.js b/WebContent/localization/OSRM.Locale.en.js
index 8f20a94ef..db52d28a8 100644
--- a/WebContent/localization/OSRM.Locale.en.js
+++ b/WebContent/localization/OSRM.Locale.en.js
@@ -20,19 +20,29 @@ or see http://www.gnu.org/licenses/agpl.txt.
 
 
 OSRM.Localization["en"] = {
-//gui
-"OPEN_JOSM": "JOSM",
-"OPEN_OSMBUGS": "OSM Bugs",
+// own language
+"LANGUAGE": "English",
+// gui
 "GUI_START": "Start",
 "GUI_END": "End",
 "GUI_RESET": "&nbsp;&nbsp;Reset&nbsp;&nbsp;",
 "GUI_SEARCH": "&nbsp;&nbsp;Show&nbsp;&nbsp;",
 "GUI_REVERSE": "Reverse",
-"GUI_OPTIONS": "Mapping Tools",
-"GUI_HIGHLIGHT_UNNAMED_ROADS": "Highlight unnamed streets",
 "GUI_START_TOOLTIP": "Enter start",
 "GUI_END_TOOLTIP": "Enter destination",
 "GUI_LEGAL_NOTICE": "GUI2 v"+OSRM.VERSION+" "+OSRM.DATE+" - OSRM hosting by <a href='http://algo2.iti.kit.edu/'>KIT</a> - Geocoder by <a href='http://www.osm.org/'>OSM</a>",
+// config
+"GUI_CONFIGURATION": "Configuration",
+"GUI_LANGUAGE": "Language",
+"GUI_UNITS": "Units",
+"GUI_KILOMETERS": "Kilometers",
+"GUI_MILES": "Miles",
+// mapping
+"GUI_MAPPING_TOOLS": "Mapping Tools",
+"GUI_HIGHLIGHT_UNNAMED_ROADS": "Highlight unnamed streets",
+"GUI_SHOW_PREVIOUS_ROUTES": "Show previous routes",
+"OPEN_JOSM": "JOSM",
+"OPEN_OSMBUGS": "OSM Bugs",
 // geocoder
 "SEARCH_RESULTS": "Search Results",
 "FOUND_X_RESULTS": "found %i results",
@@ -40,7 +50,7 @@ OSRM.Localization["en"] = {
 "NO_RESULTS_FOUND": "No results found",
 "NO_RESULTS_FOUND_SOURCE": "No results found for start",
 "NO_RESULTS_FOUND_TARGET": "No results found for end",
-//routing
+// routing
 "ROUTE_DESCRIPTION": "Route Description",
 "GET_LINK_TO_ROUTE": "Generate Link",
 "GENERATE_LINK_TO_ROUTE": "waiting for link",
@@ -50,7 +60,7 @@ OSRM.Localization["en"] = {
 "DURATION": "Duration",
 "YOUR_ROUTE_IS_BEING_COMPUTED": "Your route is being computed",
 "NO_ROUTE_FOUND": "No route possible",
-//printing
+// printing
 "OVERVIEW_MAP": "Overview Map",
 "NO_ROUTE_SELECTED": "No route selected",
 // directions
@@ -89,6 +99,6 @@ OSRM.Localization["en"] = {
 "DIRECTION_15":"You have reached your destination"
 };
 
-//set GUI language on load
+// set GUI language on load
 if( OSRM.DEFAULTS.LANUGAGE_ONDEMAND_RELOADING == true )
 	OSRM.Localization.setLanguage("en");
diff --git a/WebContent/localization/OSRM.Locale.fi.js b/WebContent/localization/OSRM.Locale.fi.js
index ab63bc61f..37df99c93 100644
--- a/WebContent/localization/OSRM.Locale.fi.js
+++ b/WebContent/localization/OSRM.Locale.fi.js
@@ -20,19 +20,29 @@ or see http://www.gnu.org/licenses/agpl.txt.
 
 
 OSRM.Localization["fi"] = {
+// own language
+"LANGUAGE": "Suomi",
 //gui
-"OPEN_JOSM": "JOSM",
-"OPEN_OSMBUGS": "OSM Bugs",
 "GUI_START": "Lähtöpaikka",
 "GUI_END": "Määränpää",
-"GUI_RESET": "&nbsp;&nbsp;Tyhjennä&nbsp;&nbsp;",
-"GUI_SEARCH": "&nbsp;&nbsp;Etsi&nbsp;&nbsp;",
+"GUI_RESET": "Tyhjennä",
+"GUI_SEARCH": "Etsi",
 "GUI_REVERSE": "Käänteinen reitti",
-"GUI_OPTIONS": "Kartoitustyökalut",
-"GUI_HIGHLIGHT_UNNAMED_ROADS": "Korosta nimettömät tiet",
 "GUI_START_TOOLTIP": "Syötä lähtöpaikka",
 "GUI_END_TOOLTIP": "Syötä määränpää",
 "GUI_LEGAL_NOTICE": "GUI2 v"+OSRM.VERSION+" "+OSRM.DATE+" - OSRM hosting by <a href='http://algo2.iti.kit.edu/'>KIT</a> - Geocoder by <a href='http://www.osm.org/'>OSM</a>",
+//config
+"GUI_CONFIGURATION": "Kokoonpano",
+"GUI_LANGUAGE": "Kieli",
+"GUI_UNITS": "Yksiköt",
+"GUI_KILOMETERS": "Kilometri",
+"GUI_MILES": "Miles",
+// mapping
+"GUI_MAPPING_TOOLS": "Kartoitustyökalut",
+"GUI_HIGHLIGHT_UNNAMED_ROADS": "Korosta nimettömät tiet",
+"GUI_SHOW_PREVIOUS_ROUTES": "Näytä edelliset reitit",
+"OPEN_JOSM": "JOSM",
+"OPEN_OSMBUGS": "OSM Bugs",
 // geocoder
 "SEARCH_RESULTS": "Haun tulokset",
 "FOUND_X_RESULTS": "Löytyi %i vaihtoehtoa",
diff --git a/WebContent/localization/OSRM.Locale.fr.js b/WebContent/localization/OSRM.Locale.fr.js
index ff4d04bea..49c8931ac 100644
--- a/WebContent/localization/OSRM.Locale.fr.js
+++ b/WebContent/localization/OSRM.Locale.fr.js
@@ -20,19 +20,29 @@ or see http://www.gnu.org/licenses/agpl.txt.
 
 
 OSRM.Localization["fr"] = {
+// own language
+"LANGUAGE": "Français",
 //gui
-"OPEN_JOSM": "JOSM",
-"OPEN_OSMBUGS": "Bugs OSM",
 "GUI_START": "Départ",
 "GUI_END": "Arrivée",
 "GUI_RESET": "Réinitialiser",
 "GUI_SEARCH": "Montrer",
 "GUI_REVERSE": "Inverser",
-"GUI_OPTIONS": "Outils de cartographie",
-"GUI_HIGHLIGHT_UNNAMED_ROADS": "Surligner les rues sans nom",
 "GUI_START_TOOLTIP": "Entrez le lieu de départ",
 "GUI_END_TOOLTIP": "Entrez le lieu d’arrivée",
 "GUI_LEGAL_NOTICE": "GUI2 v"+OSRM.VERSION+" "+OSRM.DATE+" - hébergement par <a href='http://algo2.iti.kit.edu/'>KIT</a> - géocodage par <a href='http://www.osm.org/'>OSM</a>",
+//config
+"GUI_CONFIGURATION": "Configuration",
+"GUI_LANGUAGE": "Langue",
+"GUI_UNITS": "Unités",
+"GUI_KILOMETERS": "Kilomètres",
+"GUI_MILES": "Miles",
+// mapping
+"GUI_MAPPING_TOOLS": "Outils de cartographie",
+"GUI_HIGHLIGHT_UNNAMED_ROADS": "Surligner les rues sans nom",
+"GUI_SHOW_PREVIOUS_ROUTES": "Afficher itinéraires précédents",
+"OPEN_JOSM": "JOSM",
+"OPEN_OSMBUGS": "OSM Bugs",
 // geocoder
 "SEARCH_RESULTS": "Résultats de recherche",
 "FOUND_X_RESULTS": "%i résultat(s)",
diff --git a/WebContent/localization/OSRM.Locale.pl.js b/WebContent/localization/OSRM.Locale.pl.js
index 0cb435122..abcb6ac56 100644
--- a/WebContent/localization/OSRM.Locale.pl.js
+++ b/WebContent/localization/OSRM.Locale.pl.js
@@ -20,19 +20,29 @@ or see http://www.gnu.org/licenses/agpl.txt.
 
 
 OSRM.Localization["pl"] = {
+// own language
+"LANGUAGE": "Polski",		
 //gui
-"OPEN_JOSM": "JOSM",
-"OPEN_OSMBUGS": "OSM Bugs",
 "GUI_START": "Początek",
 "GUI_END": "Koniec",
-"GUI_RESET": "&nbsp;&nbsp;Reset&nbsp;&nbsp;",
-"GUI_SEARCH": "&nbsp;&nbsp;Pokaż&nbsp;&nbsp;",
+"GUI_RESET": "Reset",
+"GUI_SEARCH": "Pokaż",
 "GUI_REVERSE": "Odwróć",
-"GUI_OPTIONS": "Narzędzia",
-"GUI_HIGHLIGHT_UNNAMED_ROADS": "Zaznacz ulice bez nazwy",
 "GUI_START_TOOLTIP": "Wprowadź początek",
 "GUI_END_TOOLTIP": "Wprowadź koniec",
 "GUI_LEGAL_NOTICE": "GUI2 v"+OSRM.VERSION+" "+OSRM.DATE+" - OSRM hosting: <a href='http://algo2.iti.kit.edu/'>KIT</a> - Geocoder: <a href='http://www.osm.org/'>OSM</a>",
+//config
+"GUI_CONFIGURATION": "Konfiguracja",
+"GUI_LANGUAGE": "Język",
+"GUI_UNITS": "Jednostki",
+"GUI_KILOMETERS": "Kilometrów",
+"GUI_MILES": "Miles",
+// mapping
+"GUI_MAPPING_TOOLS": "Narzędzia mapowania",
+"GUI_HIGHLIGHT_UNNAMED_ROADS": "Zaznacz ulice bez nazwy",
+"GUI_SHOW_PREVIOUS_ROUTES": "Pokaż poprzednie trasy",
+"OPEN_JOSM": "JOSM",
+"OPEN_OSMBUGS": "OSM Bugs",
 // geocoder
 "SEARCH_RESULTS": "Wyniki wyszukiwania",
 "FOUND_X_RESULTS": "znaleziono %i wyników",
diff --git a/WebContent/localization/OSRM.Localization.js b/WebContent/localization/OSRM.Localization.js
index 4cf346dda..1b71f6143 100644
--- a/WebContent/localization/OSRM.Localization.js
+++ b/WebContent/localization/OSRM.Localization.js
@@ -39,7 +39,7 @@ init: function() {
 	var supported_languages = OSRM.DEFAULTS.LANGUAGE_SUPPORTED;
 	for(var i=0, size=supported_languages.length; i<size; i++) {
 		var option=document.createElement("option");
-		option.innerHTML = supported_languages[i].display_name;
+		option.innerHTML = supported_languages[i].encoding;
 		option.value = supported_languages[i].encoding;
 		select.appendChild(option);
 	}
diff --git a/WebContent/main.html b/WebContent/main.html
index c5115d5c5..f6de78f2c 100644
--- a/WebContent/main.html
+++ b/WebContent/main.html
@@ -88,10 +88,14 @@ or see http://www.gnu.org/licenses/agpl.txt.
 <div id="config-content" class="box-content">
 <div id="config-toggle" class="iconic-button cancel-marker top-right-button"></div>
 
-<div id="config-label" class="label">Configuraion</div>
+<div id="gui-config-label" class="label">Configuraion</div>
 <div class="full">
-<div class="row"><div class="left">Language:</div><div class="left">German</div></div>
-<div class="row"><div class="left">Units:</div><div class="left">Miles</div></div>
+<div class="row">
+<div id="gui-language-label" class="left">Language:</div>
+<div id="gui-language-area" class="left">x</div></div>
+<div class="row">
+<div id="gui-units-label" class="left">Units:</div>
+<div id="gui-units-area" class="left">x</div></div>
 </div>
 
 </div>
@@ -102,7 +106,7 @@ or see http://www.gnu.org/licenses/agpl.txt.
 <div id="mapping-content" class="box-content">
 <div id="mapping-toggle" class="iconic-button cancel-marker top-right-button"></div>
 
-<div id="mapping-label" class="label">Mapping Tools</div>
+<div id="gui-mapping-label" class="label">Mapping Tools</div>
 <div class="full">
 <div class="left">
 <input type="checkbox" id="option-highlight-nonames" value="highlight-nonames" />