diff --git a/src/main/resources/i18n/lift-core_es_ES.properties b/src/main/resources/i18n/lift-core_es_ES.properties
index 7005dca2..3ed5dbc3 100644
--- a/src/main/resources/i18n/lift-core_es_ES.properties
+++ b/src/main/resources/i18n/lift-core_es_ES.properties
@@ -13,12 +13,21 @@ api_host = Host del API
 api_tester = Evaluador API
 view_api_explorer = Ver API Explorer
 get_api_key = Obtener llave API
-dynamic = din\u00e1micas
+dynamic = Din\u00e1micas
 another.action = Otra acci\u00f3n
 onboard = A cargo
 consent.flow = Flujo del contenido
 message.docs = Documentaci\u00f3n de mensajes
 glossary = Glosario
+space = Espacio
+bank = Banco
+choose_from = Selecciona desde ...
+accounts = Cuentas
+views = Vistas
+counterparties = Contrapartes
+transactions = Transacciones
+filter = Filtrar..
+
 
 and_distributed_under_the = y distribuido bajo la
 and_commercial_licenses = y licencias comerciales
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
index abbeff8b..88f50154 100644
--- a/src/main/webapp/index.html
+++ b/src/main/webapp/index.html
@@ -169,7 +169,7 @@
                                 <div class="dropdown">
                                     <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="#">Space</a> <hr></li>
+                                        <li name="dropdown_space"><a class="dropdown-item version" href="#"><lift:loc locid="space">Space</lift:loc></a> <hr></li>
 
                                     </ul>
                                 </div>
@@ -260,20 +260,20 @@
             <section class="option-section">
                 <div class="container">
                     <div class="option-box">
-                        <div class="option-box__headline" id="Banks-Dropdown">Bank</div>
+                        <div class="option-box__headline" id="Banks-Dropdown"><lift:loc locid="bank">Banco</lift:loc></div>
                         <!--
                         <div class="count-box">
                             <span class="count-box__number">0</span>
                         </div>
                         -->
                         <select id="bank_selector" name="Bank" class="option-box__select js-example-basic-single">
-                            <option value="Choose from..." class="option-box__option">Choose from...</option>
+                            <option value="Choose from..." class="option-box__option"><lift:loc locid="choose_from">Choose from...</lift:loc></option>
                             <option value="Choose from..." class="option-box__option">Placeholder</option>
                             <option value="Choose from..." class="option-box__option">Placeholder</option>
                         </select>
                     </div>
                     <div class="option-box">
-                        <div class="option-box__headline" id="Accounts-Dropdown">Accounts</div>
+                        <div class="option-box__headline" id="Accounts-Dropdown"><lift:loc locid="accounts">Accounts</lift:loc></div>
                         <!--
                         <div class="count-box">
                             <span class="count-box__number">0</span>
@@ -287,20 +287,20 @@
                         </select>
                     </div>
                     <div class="option-box" name="views_box">
-                        <div class="option-box__headline" id="Views-Dropdown">Views</div>
+                        <div class="option-box__headline" id="Views-Dropdown"><lift:loc locid="views">Views</lift:loc></div>
                         <!--
                         <div class="count-box">
                             <span class="count-box__number">0</span>
                         </div>
                         -->
                         <select id="view_selector" name="Views" class="option-box__select js-example-basic-single">
-                            <option value="Choose from..." class="option-box__option">Choose from...</option>
+                            <option value="Choose from..." class="option-box__option"><lift:loc locid="choose_from">Choose from...</lift:loc></option>
                             <option value="Choose from..." class="option-box__option">Placeholder</option>
                             <option value="Choose from..." class="option-box__option">Placeholder</option>
                         </select>
                     </div>
                     <div class="option-box" id="counterparty_selector-option-box">
-                        <div class="option-box__headline" id="Counterparties-Dropdown">Counterparties</div>
+                        <div class="option-box__headline" id="Counterparties-Dropdown"><lift:loc locid="counterparties">Counterparties</lift:loc></div>
                         <!--
                         <div class="count-box">
                             <span class="count-box__number">0</span>
@@ -308,13 +308,13 @@
                         -->
                         <select id="counterparty_selector" name="Counterparties"
                                 class="option-box__select js-example-basic-single">
-                            <option value="Choose from..." class="option-box__option">Choose from...</option>
+                            <option value="Choose from..." class="option-box__option"><lift:loc locid="choose_from">Choose from...</lift:loc></option>
                             <option value="Choose from..." class="option-box__option">placeholder</option>
                             <option value="Choose from..." class="option-box__option">placeholder</option>
                         </select>
                     </div>
                     <div class="option-box" id="transaction_selector-option-box">
-                        <div class="option-box__headline" id="Transactions-Dropdown">Transactions</div>
+                        <div class="option-box__headline" id="Transactions-Dropdown"><lift:loc locid="transactions">Transactions</lift:loc></div>
                         <!--
                         <div class="count-box">
                             <span class="count-box__number">0</span>
@@ -322,7 +322,7 @@
                         -->
                         <select id="transaction_selector" name="Transactions"
                                 class="option-box__select js-example-basic-single">
-                            <option value="Choose from..." class="option-box__option">Choose from...</option>
+                            <option value="Choose from..." class="option-box__option"><lift:loc locid="choose_from">Choose from...</lift:loc></option>
                             <option value="Choose from..." class="option-box__option">Placeholder</option>
                             <option value="Choose from..." class="option-box__option">Placeholder</option>
                         </select>
diff --git a/src/main/webapp/templates-hidden/default.html b/src/main/webapp/templates-hidden/default.html
index 155edb18..d1b8d25b 100755
--- a/src/main/webapp/templates-hidden/default.html
+++ b/src/main/webapp/templates-hidden/default.html
@@ -78,7 +78,7 @@ along with this program.  If not, see www.gnu.org/licenses/
             <div class="settings-box" data-lift="Login.login">
                 <div class="sign-box">
                     <div class="logged-out">
-                        <a id="start-login" class="sign-box__text signed"  href="#">Log on</a>
+                        <a id="start-login" class="sign-box__text signed"  href="#"><lift:loc locid="logon">Log on</lift:loc></a>
                     </div>
                     <div class="logged-in">
                         <!--
@@ -92,7 +92,7 @@ along with this program.  If not, see www.gnu.org/licenses/
                     <div class="logged-in">
                         <span class="username"></span>
                         <a class="settings-imgs__link" id="logout" href="#">
-                            <span class="logout-link">Log off</span>
+                            <span class="logout-link"><lift:loc locid="logoff">Log off</lift:loc></span>
                         </a>
                         <!--
                         <a href="#" class="settings-imgs__link">