diff --git a/src/main/resources/i18n/lift-core_es_ES.properties b/src/main/resources/i18n/lift-core_es_ES.properties
index 865502a0..54777ee8 100644
--- a/src/main/resources/i18n/lift-core_es_ES.properties
+++ b/src/main/resources/i18n/lift-core_es_ES.properties
@@ -1,7 +1,7 @@
-api_explorer = Explorador API
+api_explorer = API Explorer
 api_management = Gestion API
 user_management = Gestion de Usuarios
-api_manager = Gestor API
+api_manager = API Manager
 introduction = Introducción
 support = Soporte
 register = Registrarse
@@ -11,8 +11,13 @@ privacy_policy = Pol
 api_documentation = Documentación API
 api_host = Host del API
 api_tester = Evaluador API
-view_api_explorer = Ver Explorador API
-get_api_key = Obten llave API
+view_api_explorer = Ver API Explorer
+get_api_key = Obtener llave API
+
+and_distributed_under_the = y distribuido bajo la
+and_commercial_licenses = y licencias comerciales
+spaces = Espacios
+more = More
 
 
 invalid.email.address = Invalid email address
@@ -364,22 +369,22 @@ country_270 = Peter I Island
 country_271 = Queen Maud Land
 country_272 = British Antarctic Territory
 # LiftScreen + Wizard
-Next = Next
-Previous = Previous
-Finish = Finish
-Cancel = Cancel
+Next = Siguiente
+Previous = Anterior
+Finish = Terminado
+Cancel = Cancelado
 
 # Crudify
-Create = Create
-Save = Save
-Edit = Edit
-Delete = Delete
-delete = delete
-View = View
-List = List %s
-Created = Created
-Edited = Edited
-Deleted = Deleted
+Create = Crear
+Save = Guardar
+Edit = Editar
+Delete = Borrar
+delete = borrar
+View = Ver
+List = Lista %s
+Created = Creado
+Edited = Editado
+Deleted = Borrado
 
 #OBP specific fields
 consumer.registration.nav.name=Obtener llave API
diff --git a/src/main/scala/code/snippet/WebUI.scala b/src/main/scala/code/snippet/WebUI.scala
index 14b73d2a..ae89f8da 100644
--- a/src/main/scala/code/snippet/WebUI.scala
+++ b/src/main/scala/code/snippet/WebUI.scala
@@ -40,6 +40,13 @@ class WebUI extends MdcLoggable {
 
   @transient protected val log = logger //Logger(this.getClass)
 
+  // language tag
+  def homePage = {
+    val host = Props.get("base_url").getOrElse("unknown")
+    "#Es a [href]" #> scala.xml.Unparsed(s"$host/?locale=es_ES") &
+      "#En a [href]" #> scala.xml.Unparsed(s"$host/?locale=en_EN")
+  }
+
 
   // Change the main style sheet
   def mainStyleSheet: CssSel = {
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
index c9cb074b..d645984d 100644
--- a/src/main/webapp/index.html
+++ b/src/main/webapp/index.html
@@ -144,7 +144,7 @@
 <!--                            </li>-->
                             <li class="breadcrumbs__list">
                                 <div class="dropdown">
-                                    <button class="btn btn-info dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">More <img src="./media/images/chevron_down_thick_write.svg" alt="Girl in a jacket" width="10" height="10"></button>
+                                    <button class="btn btn-info dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <lift:loc locid="more">More</lift:loc> <img src="./media/images/chevron_down_thick_write.svg" alt="Girl in a jacket" width="10" height="10"></button>
                                     <ul class="dropdown-menu" aria-labelledby="dropdownMenuButton">
                                         <li name="dropdown_versions"><a class="dropdown-item version" href="#">Another action</a> <hr></li>
 
@@ -167,9 +167,9 @@
 
                             <li class="breadcrumbs__list">
                                 <div class="dropdown">
-                                    <button aria-expanded="false" aria-haspopup="true" data-toggle="dropdown" id="dropdownMenuButton" type="button" class="btn btn-info dropdown-toggle">Spaces <img height="10" width="10" alt="Girl in a jacket" src="./media/images/chevron_down_thick_write.svg"></button>
+                                    <button aria-expanded="false" aria-haspopup="true" data-toggle="dropdown" id="dropdownMenuButton" type="button" class="btn btn-info dropdown-toggle"><lift:loc locid="spaces">Spaces</lift:loc> <img height="10" width="10" alt="Girl in a jacket" src="./media/images/chevron_down_thick_write.svg"></button>
                                     <ul aria-labelledby="dropdownMenuButton" class="dropdown-menu">
-                                        <li name="dropdown_space"><a class="dropdown-item version" href="#">Space1</a> <hr></li>
+                                        <li name="dropdown_space"><a class="dropdown-item version" href="#">Space</a> <hr></li>
 
                                     </ul>
                                 </div>
diff --git a/src/main/webapp/templates-hidden/default.html b/src/main/webapp/templates-hidden/default.html
index 92be71a5..155edb18 100755
--- a/src/main/webapp/templates-hidden/default.html
+++ b/src/main/webapp/templates-hidden/default.html
@@ -154,8 +154,16 @@ along with this program.  If not, see www.gnu.org/licenses/
                     <li>
                         <a href="https://github.com/OpenBankProject/API-Explorer" class="footer-link-box__link">Github</a>
                     </li>
+                    <li>
+                        <div class="language-tag" data-lift="WebUI.homePage">
+                            <span><a href="#" >Language</a></span>
+                            <span><a id="es" href="/" >ES</a></span>
+                            <span><a href="/" >|</a></span>
+                            <span><a id="en" href="/" >EN</a></span>
+                        </div>
+                    </li>
                 </ul>
-                <p class="footer-box__paragraph2">&copy; 2011-<span id="copyright-year" data-lift="WebUI.currentYearText">2018</span>  <a href="http://www.tesobe.com/" class="footer_link">TESOBE GmbH</a> and distributed under the <a href="https://en.wikipedia.org/wiki/GNU_Affero_General_Public_License" class="footer_link footer-box__paragraph">AGPL</a> and commercial licenses.</p>
+                <p class="footer-box__paragraph2">Open Bank Project is &copy; 2011-<span id="copyright-year" data-lift="WebUI.currentYearText">2018</span>  <a href="http://www.tesobe.com/" class="footer_link">TESOBE GmbH</a><lift:loc locid="and_distributed_under_the">and distributed under the</lift:loc>  <a href="https://en.wikipedia.org/wiki/GNU_Affero_General_Public_License" class="footer_link footer-box__paragraph">AGPL</a> <lift:loc locid="and_commercial_licenses">and commercial licenses.</lift:loc></p>
                 
             </div>
         </div>