diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
index 43d85f052..0c974b637 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
@@ -357,15 +357,15 @@ class ChillMainExtension extends Extension implements
                     'actions' => [
                         'index' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillMain/Admin/Location/index.html.twig',
+                            'template' => '@ChillMain/Location/index.html.twig',
                         ],
                         'new' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillMain/Admin/Location/new.html.twig',
+                            'template' => '@ChillMain/Location/new.html.twig',
                         ],
                         'edit' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillMain/Admin/Location/edit.html.twig',
+                            'template' => '@ChillMain/Location/edit.html.twig',
                         ],
                     ],
                 ],
@@ -379,15 +379,15 @@ class ChillMainExtension extends Extension implements
                     'actions' => [
                         'index' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillMain/Admin/LocationType/index.html.twig',
+                            'template' => '@ChillMain/LocationType/index.html.twig',
                         ],
                         'new' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillMain/Admin/LocationType/new.html.twig',
+                            'template' => '@ChillMain/LocationType/new.html.twig',
                         ],
                         'edit' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillMain/Admin/LocationType/edit.html.twig',
+                            'template' => '@ChillMain/LocationType/edit.html.twig',
                         ],
                     ],
                 ],
@@ -401,15 +401,15 @@ class ChillMainExtension extends Extension implements
                     'actions' => [
                         'index' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillMain/Admin/Country/index.html.twig',
+                            'template' => '@ChillMain/Country/index.html.twig',
                         ],
                         'new' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillMain/Admin/Country/new.html.twig',
+                            'template' => '@ChillMain/Country/new.html.twig',
                         ],
                         'edit' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillMain/Admin/Country/edit.html.twig',
+                            'template' => '@ChillMain/Country/edit.html.twig',
                         ],
                     ],
                 ],
@@ -423,15 +423,15 @@ class ChillMainExtension extends Extension implements
                     'actions' => [
                         'index' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillMain/Admin/Civility/index.html.twig',
+                            'template' => '@ChillMain/Civility/index.html.twig',
                         ],
                         'new' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillMain/Admin/Civility/new.html.twig',
+                            'template' => '@ChillMain/Civility/new.html.twig',
                         ],
                         'edit' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillMain/Admin/Civility/edit.html.twig',
+                            'template' => '@ChillMain/Civility/edit.html.twig',
                         ],
                     ],
                 ],
@@ -445,15 +445,15 @@ class ChillMainExtension extends Extension implements
                     'actions' => [
                         'index' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillMain/Admin/Language/index.html.twig',
+                            'template' => '@ChillMain/Language/index.html.twig',
                         ],
                         'new' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillMain/Admin/Language/new.html.twig',
+                            'template' => '@ChillMain/Language/new.html.twig',
                         ],
                         'edit' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillMain/Admin/Language/edit.html.twig',
+                            'template' => '@ChillMain/Language/edit.html.twig',
                         ],
                     ],
                 ],
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/Location/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/Location/edit.html.twig
deleted file mode 100644
index d34d6968f..000000000
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/Location/edit.html.twig
+++ /dev/null
@@ -1,39 +0,0 @@
-{% extends '@ChillMain/Admin/layout.html.twig' %}
-
-{% block title %}
-{% include('@ChillMain/CRUD/_edit_title.html.twig') %}
-{% endblock %}
-
-{% block admin_content %}
-{% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
-
-    {% block crud_content_form_rows %}
-      
-        {{ form_row(form.locationType) }}
-
-        <div class="location-form-address">
-        {{ form_row(form.address) }}
-        </div>
-
-        {{ form_row(form.name) }}
-
-        <div class="location-form-contact">
-        {{ form_row(form.phonenumber1) }}
-        {{ form_row(form.phonenumber2) }}
-        {{ form_row(form.email) }}
-        </div>
-
-    {% endblock crud_content_form_rows %}
-
-    {% block content_form_actions_save_and_show %}{% endblock %}
-{% endembed %}
-{% endblock %}
-
-{% block js %}
-    {{ encore_entry_script_tags('mod_input_address') }}
-    {{ encore_entry_script_tags('page_location') }}
-{% endblock %}
-
-{% block css %}
-    {{ encore_entry_link_tags('mod_input_address') }}
-{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/Location/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/Location/new.html.twig
deleted file mode 100644
index ba25a05e0..000000000
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/Location/new.html.twig
+++ /dev/null
@@ -1,39 +0,0 @@
-{% extends '@ChillMain/Admin/layout.html.twig' %}
-
-{% block title %}
-{% include('@ChillMain/CRUD/_new_title.html.twig') %}
-{% endblock %}
-
-{% block admin_content %}
-{% embed '@ChillMain/CRUD/_new_content.html.twig' %}
-
-    {% block crud_content_form_rows %}
-      
-        {{ form_row(form.locationType) }}
-
-        <div class="location-form-address">
-        {{ form_row(form.address) }}
-        </div>
-
-        {{ form_row(form.name) }}
-
-        <div class="location-form-contact">
-        {{ form_row(form.phonenumber1) }}
-        {{ form_row(form.phonenumber2) }}
-        {{ form_row(form.email) }}
-        </div>
-
-    {% endblock crud_content_form_rows %}
-
-    {% block content_form_actions_save_and_show %}{% endblock %}
-{% endembed %}
-{% endblock %}
-
-{% block js %}
-    {{ encore_entry_script_tags('mod_input_address') }}
-    {{ encore_entry_script_tags('page_location') }}
-{% endblock %}
-
-{% block css %}
-    {{ encore_entry_link_tags('mod_input_address') }}
-{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/LocationType/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/LocationType/edit.html.twig
deleted file mode 100644
index ad0a38f73..000000000
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/LocationType/edit.html.twig
+++ /dev/null
@@ -1,14 +0,0 @@
-{% extends '@ChillMain/Admin/layout.html.twig' %}
-
-{% block title %}
-{% include('@ChillMain/CRUD/_edit_title.html.twig') %}
-{% endblock %}
-
-{% block admin_content %}
-{# {% as we are in the admin layout, we override the admin content with the CRUD content %} #}
-{% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
-    {# we do not have "view" page. We empty the corresponding block #}
-    {% block content_form_actions_view %}{% endblock %}
-    {% block content_form_actions_save_and_show %}{% endblock %}
-{% endembed %}
-{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/LocationType/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/LocationType/new.html.twig
deleted file mode 100644
index 0781272a1..000000000
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/LocationType/new.html.twig
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends '@ChillMain/Admin/layout.html.twig' %}
-
-{% block title %}
-{% include('@ChillMain/CRUD/_new_title.html.twig') %}
-{% endblock %}
-
-{% block admin_content %}
-{% embed '@ChillMain/CRUD/_new_content.html.twig' %}
-    {% block content_form_actions_save_and_show %}{% endblock %}
-{% endembed %}
-{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/Civility/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Civility/edit.html.twig
similarity index 57%
rename from src/Bundle/ChillMainBundle/Resources/views/Admin/Civility/edit.html.twig
rename to src/Bundle/ChillMainBundle/Resources/views/Civility/edit.html.twig
index 1160220a3..4d55c480c 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/Civility/edit.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Civility/edit.html.twig
@@ -1,7 +1,11 @@
 {% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
-{% block content -%}
+{% block title %}
+    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
         {% block content_form_actions_save_and_show %}{% endblock %}
     {% endembed %}
-{% endblock content %}
+{% endblock admin_content %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/Civility/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Civility/index.html.twig
similarity index 77%
rename from src/Bundle/ChillMainBundle/Resources/views/Admin/Civility/index.html.twig
rename to src/Bundle/ChillMainBundle/Resources/views/Civility/index.html.twig
index 9d28d3339..60a9c0c63 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/Civility/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Civility/index.html.twig
@@ -1,14 +1,13 @@
 {% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
-
 {% block admin_content %}
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
         {% block table_entities_thead_tr %}
             <th>id</th>
-            <th>name</th>
-            <th>abbreviation</th>
-            <th>active</th>
-            <th>ordering</th>
+            <th>{{ 'name'|trans }}</th>
+            <th>{{ 'abbreviation'|trans }}</th>
+            <th>{{ 'active'|trans }}</th>
+            <th>{{ 'ordering'|trans }}</th>
             <th></th>
         {% endblock %}
         {% block table_entities_tbody %}
@@ -17,7 +16,13 @@
                     <td>{{ entity.id }}</td>
                     <td>{{ entity.name|localize_translatable_string }}</td>
                     <td>{{ entity.abbreviation|localize_translatable_string }}</td>
-                    <td>{{ entity.active }}</td>
+                    <td style="text-align:center;">
+						{%- if entity.active -%}
+							<i class="fa fa-check-square-o"></i>
+						{%- else -%}
+							<i class="fa fa-square-o"></i>
+						{%- endif -%}
+					</td>
                     <td>{{ entity.order }}</td>
                     <td>
                         <ul class="record_actions">
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/Language/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Civility/new.html.twig
similarity index 57%
rename from src/Bundle/ChillMainBundle/Resources/views/Admin/Language/new.html.twig
rename to src/Bundle/ChillMainBundle/Resources/views/Civility/new.html.twig
index 643de1ff4..7c204dddd 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/Language/new.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Civility/new.html.twig
@@ -1,7 +1,11 @@
 {% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
-{% block content -%}
+{% block title %}
+    {% include('@ChillMain/CRUD/_new_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
         {% block content_form_actions_save_and_show %}{% endblock %}
     {% endembed %}
-{% endblock content %}
+{% endblock admin_content %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/Language/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Country/edit.html.twig
similarity index 57%
rename from src/Bundle/ChillMainBundle/Resources/views/Admin/Language/edit.html.twig
rename to src/Bundle/ChillMainBundle/Resources/views/Country/edit.html.twig
index 1160220a3..4d55c480c 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/Language/edit.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Country/edit.html.twig
@@ -1,7 +1,11 @@
 {% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
-{% block content -%}
+{% block title %}
+    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
         {% block content_form_actions_save_and_show %}{% endblock %}
     {% endembed %}
-{% endblock content %}
+{% endblock admin_content %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/Country/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Country/index.html.twig
similarity index 71%
rename from src/Bundle/ChillMainBundle/Resources/views/Admin/Country/index.html.twig
rename to src/Bundle/ChillMainBundle/Resources/views/Country/index.html.twig
index 67aa70fd1..3a52e9383 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/Country/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Country/index.html.twig
@@ -1,11 +1,11 @@
 {% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
-{% block content %}
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
         {% block table_entities_thead_tr %}
             <th>id</th>
-            <th>name</th>
-            <th>countryCode</th>
+            <th>{{ 'name'|trans }}</th>
+            <th>{{ 'Country code'|trans }}</th>
             <th></th>
         {% endblock %}
         {% block table_entities_tbody %}
@@ -24,6 +24,13 @@
                 </tr>
             {% endfor %}
         {% endblock %}
-    {% endembed %}
-{% endblock content %}
+
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
+        {% endblock %}
+
+    {% endembed %}
+{% endblock admin_content %}
 
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/Country/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Country/new.html.twig
similarity index 57%
rename from src/Bundle/ChillMainBundle/Resources/views/Admin/Country/new.html.twig
rename to src/Bundle/ChillMainBundle/Resources/views/Country/new.html.twig
index 643de1ff4..7c204dddd 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/Country/new.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Country/new.html.twig
@@ -1,7 +1,11 @@
 {% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
-{% block content -%}
+{% block title %}
+    {% include('@ChillMain/CRUD/_new_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
         {% block content_form_actions_save_and_show %}{% endblock %}
     {% endembed %}
-{% endblock content %}
+{% endblock admin_content %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/Country/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Language/edit.html.twig
similarity index 57%
rename from src/Bundle/ChillMainBundle/Resources/views/Admin/Country/edit.html.twig
rename to src/Bundle/ChillMainBundle/Resources/views/Language/edit.html.twig
index 1160220a3..4d55c480c 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/Country/edit.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Language/edit.html.twig
@@ -1,7 +1,11 @@
 {% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
-{% block content -%}
+{% block title %}
+    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
         {% block content_form_actions_save_and_show %}{% endblock %}
     {% endembed %}
-{% endblock content %}
+{% endblock admin_content %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/Language/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Language/index.html.twig
similarity index 96%
rename from src/Bundle/ChillMainBundle/Resources/views/Admin/Language/index.html.twig
rename to src/Bundle/ChillMainBundle/Resources/views/Language/index.html.twig
index 21d2afca9..bfc57c0d1 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/Language/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Language/index.html.twig
@@ -4,7 +4,7 @@
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
         {% block table_entities_thead_tr %}
             <th>id</th>
-            <th>name</th>
+            <th>{{ 'Name'|trans }}</th>
             <th>&nbsp;</th>
         {% endblock %}
 
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/Civility/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Language/new.html.twig
similarity index 57%
rename from src/Bundle/ChillMainBundle/Resources/views/Admin/Civility/new.html.twig
rename to src/Bundle/ChillMainBundle/Resources/views/Language/new.html.twig
index b16f2eeba..7c204dddd 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/Civility/new.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Language/new.html.twig
@@ -1,7 +1,11 @@
 {% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
-{% block content %}
+{% block title %}
+    {% include('@ChillMain/CRUD/_new_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
         {% block content_form_actions_save_and_show %}{% endblock %}
     {% endembed %}
-{% endblock content %}
+{% endblock admin_content %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Location/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Location/edit.html.twig
new file mode 100644
index 000000000..ac6beb235
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Location/edit.html.twig
@@ -0,0 +1,39 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+
+        {% block crud_content_form_rows %}
+
+            {{ form_row(form.locationType) }}
+
+            <div class="location-form-address">
+            {{ form_row(form.address) }}
+            </div>
+
+            {{ form_row(form.name) }}
+
+            <div class="location-form-contact">
+            {{ form_row(form.phonenumber1) }}
+            {{ form_row(form.phonenumber2) }}
+            {{ form_row(form.email) }}
+            </div>
+
+        {% endblock crud_content_form_rows %}
+
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}
+
+{% block js %}
+    {{ encore_entry_script_tags('mod_input_address') }}
+    {{ encore_entry_script_tags('page_location') }}
+{% endblock %}
+
+{% block css %}
+    {{ encore_entry_link_tags('mod_input_address') }}
+{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/Location/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Location/index.html.twig
similarity index 57%
rename from src/Bundle/ChillMainBundle/Resources/views/Admin/Location/index.html.twig
rename to src/Bundle/ChillMainBundle/Resources/views/Location/index.html.twig
index aa883c603..913a975cd 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/Location/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Location/index.html.twig
@@ -1,20 +1,16 @@
-{% extends "@ChillMain/Admin/layout_location.html.twig" %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block admin_content %}
-	<h1>{{ 'Location list'|trans }}</h1>
-
-	<table class="records_list table table-bordered border-dark">
-		<thead>
-			<tr>
-                <th>{{ 'Name'|trans }}</th>
-				<th>{{ 'Phonenumber1'|trans }}</th>
-				<th>{{ 'Phonenumber2'|trans }}</th>
-				<th>{{ 'Email'|trans }}</th>
-				<th>{{ 'Address'|trans }}</th>
-				<th>{{ 'Active'|trans }}</th>
-			</tr>
-		</thead>
-		<tbody>
+	{% embed '@ChillMain/CRUD/_index.html.twig' %}
+        {% block table_entities_thead_tr %}
+			<th>{{ 'Name'|trans }}</th>
+			<th>{{ 'Phonenumber1'|trans }}</th>
+			<th>{{ 'Phonenumber2'|trans }}</th>
+			<th>{{ 'Email'|trans }}</th>
+			<th>{{ 'Address'|trans }}</th>
+			<th>{{ 'Active'|trans }}</th>
+        {% endblock %}
+        {% block table_entities_tbody %}
 			{% for entity in entities %}
 			    <tr>
                     <td>{{ entity.name }}</td>
@@ -44,17 +40,12 @@
 					</td>
 				</tr>
 			{% endfor %}
-		</tbody>
-	</table>
+        {% endblock %}
 
-    {{ chill_pagination(paginator) }}
-
-	<ul class="record_actions">
-		<li>
-			<a href="{{ path('chill_crud_main_location_new') }}" class="btn btn-create">
-				{{ 'Create a new location'|trans }}
-			</a>
-		</li>
-	</ul>
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
+        {% endblock %}
+    {% endembed %}
 {% endblock %}
-
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Location/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Location/new.html.twig
new file mode 100644
index 000000000..493ad6f71
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Location/new.html.twig
@@ -0,0 +1,39 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_new_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
+
+        {% block crud_content_form_rows %}
+
+            {{ form_row(form.locationType) }}
+
+            <div class="location-form-address">
+            {{ form_row(form.address) }}
+            </div>
+
+            {{ form_row(form.name) }}
+
+            <div class="location-form-contact">
+            {{ form_row(form.phonenumber1) }}
+            {{ form_row(form.phonenumber2) }}
+            {{ form_row(form.email) }}
+            </div>
+
+        {% endblock crud_content_form_rows %}
+
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}
+
+{% block js %}
+    {{ encore_entry_script_tags('mod_input_address') }}
+    {{ encore_entry_script_tags('page_location') }}
+{% endblock %}
+
+{% block css %}
+    {{ encore_entry_link_tags('mod_input_address') }}
+{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/views/LocationType/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/LocationType/edit.html.twig
new file mode 100644
index 000000000..4d55c480c
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/LocationType/edit.html.twig
@@ -0,0 +1,11 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/LocationType/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/LocationType/index.html.twig
similarity index 60%
rename from src/Bundle/ChillMainBundle/Resources/views/Admin/LocationType/index.html.twig
rename to src/Bundle/ChillMainBundle/Resources/views/LocationType/index.html.twig
index 22cb6de44..16b31dd77 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/LocationType/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/LocationType/index.html.twig
@@ -1,21 +1,17 @@
-{% extends "@ChillMain/Admin/layout_location.html.twig" %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block admin_content %}
-	<h1>{{ 'Location type list'|trans }}</h1>
-
-	<table class="records_list table table-bordered border-dark">
-		<thead>
-			<tr>
-                <th>{{ 'Title'|trans }}</th>
-				<th>{{ 'Available for users'|trans }}</th>
-				<th>{{ 'Editable by users'|trans }}</th>
-				<th>{{ 'Address required'|trans }}</th>
-				<th>{{ 'Contact data'|trans }}</th>
-				<th>{{ 'Active'|trans }}</th>
-				<th>{{ 'Default for'|trans }}</th>
-			</tr>
-		</thead>
-		<tbody>
+	{% embed '@ChillMain/CRUD/_index.html.twig' %}
+        {% block table_entities_thead_tr %}
+			<th>{{ 'Title'|trans }}</th>
+			<th>{{ 'Available for users'|trans }}</th>
+			<th>{{ 'Editable by users'|trans }}</th>
+			<th>{{ 'Address required'|trans }}</th>
+			<th>{{ 'Contact data'|trans }}</th>
+			<th>{{ 'Active'|trans }}</th>
+			<th>{{ 'Default for'|trans }}</th>
+        {% endblock %}
+        {% block table_entities_tbody %}
 			{% for entity in entities %}
 				<tr>
                     <td>{{ entity.title | localize_translatable_string }}</td>
@@ -52,14 +48,12 @@
 					</td>
 				</tr>
 			{% endfor %}
-		</tbody>
-	</table>
+     {% endblock %}
 
-	<ul class="record_actions">
-		<li>
-			<a href="{{ path('chill_crud_main_location_type_new') }}" class="btn btn-create">
-				{{ 'Create a new location type'|trans }}
-			</a>
-		</li>
-	</ul>
-{% endblock %}
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
+        {% endblock %}
+    {% endembed %}
+{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/views/LocationType/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/LocationType/new.html.twig
new file mode 100644
index 000000000..7c204dddd
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/LocationType/new.html.twig
@@ -0,0 +1,11 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_new_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php
index b21f83846..cfbc2a78d 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php
@@ -62,7 +62,7 @@ class AdminSectionMenuBuilder implements LocalMenuBuilderInterface
 
         $menu->addChild('Languages and countries')
             ->setAttribute('class', 'list-group-item-header')
-            ->setExtras(['order' => 200, 'header' => 'true']);
+            ->setExtras(['order' => 200, 'header' => true]);
 
         $menu->addChild('Language list', [
             'route' => 'chill_crud_main_language_index',
@@ -76,7 +76,7 @@ class AdminSectionMenuBuilder implements LocalMenuBuilderInterface
 
         $menu->addChild('Location and location type')
             ->setAttribute('class', 'list-group-item-header')
-            ->setExtras(['order' => 300, 'header' => 'true']);
+            ->setExtras(['order' => 300, 'header' => true]);
 
         $menu->addChild('Location type list', [
             'route' => 'chill_crud_main_location_type_index',
diff --git a/src/Bundle/ChillMainBundle/translations/admin.fr.yml b/src/Bundle/ChillMainBundle/translations/admin.fr.yml
deleted file mode 100644
index c2d522a12..000000000
--- a/src/Bundle/ChillMainBundle/translations/admin.fr.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-welcome_message_raw: |
-    <p>Dans l'interface d'administration, vous pouvez configurer votre instance selon vos besoins.</p>
-
-
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index e679db535..cd76aed98 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -120,7 +120,7 @@ Main admin menu: Menu d'administration principal
 Actions: Actions
 Users and permissions: Utilisateurs et permissions
 Location and location type: Localisations et types de localisation
-Back to the admin: Retour
+Back to the admin: Menu d'administration
 
 #permissions
 Permissions Menu: Gestion des droits
@@ -224,6 +224,8 @@ none: aucun
 person: usager
 thirdparty: tiers
 
+#admin section for civility
+abbreviation: abbréviation
 
 #admin section for language and country
 Language and countries menu: Menu Langues & Pays
@@ -232,6 +234,7 @@ Management of languages and countries: Gestion des langues & pays
 Configure languages and countries: Configuration des langues & pays
 Language list: Liste des langues
 Country list: Liste des pays
+Country code: Code du pays
 
 # circles / scopes
 Choose the circle: Choisir le cercle
@@ -349,9 +352,15 @@ crud:
     title_new: Nouveau métier
     title_edit: Modifier un métier
   main_location_type:
+    index:
+      title: Liste des types de localisations
+      add_new: Ajouter un type de localisation
     title_new: Nouveau type de localisation
     title_edit: Modifier un type de localisation
   main_location:
+    index:
+      title: Liste des localisations
+      add_new: Ajouter une localisation
     title_new: Nouvelle localisation
     title_edit: Modifier une localisation
   main_language: