diff --git a/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss
index 6aa0e1c8d..2581e3aa7 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss
@@ -14,7 +14,7 @@ div#header-accompanying_course-name {
   background: none repeat scroll 0 0 #718596;
   color: #FFF;
   h1 {
-    margin: 0.4em 0;       
+    margin: 0.4em 0;
   }
   span {
     a {
@@ -49,15 +49,167 @@ div.subheader {
    }
 }
 
-//// à ranger
+//// VUEJS ////
+div.vue-component {
+  padding: 1.5em;
+  margin: 2em 0;
+  border: 2px dashed grey;
+  position: relative;
+  &:before {
+    content: "vuejs component";
+    position: absolute;
+    left: 1.5em;
+    top: -0.9em;
+    background-color: white;
+    color: grey;
+    padding: 0 0.3em;
+  }
+  dd { margin-left: 1em; }
+}
+
+//// MODAL ////
+.modal-mask {
+   position: fixed;
+   z-index: 9998;
+   top: 0;
+   left: 0;
+   width: 100%;
+   height: 100%;
+   background-color: rgba(0, 0, 0, 0.75);
+   display: table;
+   transition: opacity 0.3s ease;
+}
+.modal-header .close { // bootstrap classes, override sc-button 0 radius
+   border-top-right-radius: 0.3rem;
+}
+
+/*
+* The following styles are auto-applied to elements with
+* transition="modal" when their visibility is toggled
+* by Vue.js.
+*
+* You can easily play with the modal transition by editing
+* these styles.
+*/
+.modal-enter {
+   opacity: 0;
+}
+.modal-leave-active {
+   opacity: 0;
+}
+.modal-enter .modal-container,
+.modal-leave-active .modal-container {
+   -webkit-transform: scale(1.1);
+   transform: scale(1.1);
+}
+
+//// AddPersons modal
+div.body-head {
+   overflow-y: unset;
+   div.modal-body:first-child {
+      margin: auto 4em;
+      div.search {
+         position: relative;
+         input {
+            padding: 1.2em 1.5em 1.2em 2.5em;
+            margin: 1em 0;
+         }
+         i {
+            position: absolute;
+            opacity: 0.5;
+            padding: 0.65em 0;
+            top: 50%;
+         }
+         i.fa-search {
+            left: 0.5em;
+         }
+         i.fa-times {
+            right: 1em;
+            padding: 0.75em 0;
+            cursor: pointer;
+         }
+      }
+   }
+   div.modal-body:last-child {
+      padding-bottom: 0;
+   }
+}
+div.count {
+   margin: -0.5em 0 0.7em;
+   display: flex;
+   justify-content: space-between;
+   a {
+      cursor: pointer;
+   }
+}
+div.results {
+   div.list-item {
+      padding: 0.4em 0.8em;
+      display: flex;
+      flex-direction: row;
+      &.checked {
+         background-color: #ececec;
+         border-bottom: 1px dotted #8b8b8b;
+      }
+      div.container {
+         & > input {
+            margin-right: 0.8em;
+         }
+         span:not(.name) {
+            margin-left: 0.5em;
+            opacity: 0.5;
+            font-size: 90%;
+            font-style: italic;
+         }
+      }
+      div.right_actions {
+         margin: 0 0 0 auto;
+         display: flex;
+         align-items: flex-end;
+         & > * {
+            margin-left: 0.5em;
+            align-self: baseline;
+         }
+         a.sc-button {
+            border: 1px solid lightgrey;
+            font-size: 70%;
+            padding: 4px;
+         }
+      }
+   }
+}
 .discret {
    color: grey;
    margin-right: 1em;
 }
 
-table {
-   ul.record_actions {
-      margin: 0;
-      padding: 0.5em;
+
+div.address_form {
+   display: flex;
+   flex-direction: column;
+   div.address_form__header {
+
+   }
+   div.address_form__select {
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+
+      div.address_form__select__body {
+         display: flex;
+         flex-direction: column;
+         flex-grow: 1;
+      }
+
+      div.address_form__select__map {
+         margin: 0px 20px;
+         div#address_map {
+            height:400px;
+            width:400px;
+         }
+      }
+   }
+   div.address_form__more {
+
    }
 }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js
index 87ee9a5c0..9e88b8e90 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js
@@ -6,7 +6,7 @@ const addressMessages = {
       select_country: 'Choisir le pays',
       select_city: 'Choisir une localité',
       select_address: 'Choisir une adresse',
-      isNoAddress: 'L\'adresse n\'est pas celle d\'un domicile fixe ?',
+      isNoAddress: 'Pas d\'adresse complète',
       floor: 'Étage',
       corridor: 'Couloir',
       steps: 'Escalier',
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue
index 13d7c2f2b..33cf6d8a5 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue
@@ -13,42 +13,55 @@
          </template>
 
          <template v-slot:body>
+            <div class="address_form">
 
-            <h4>{{ $t('select_an_address') }}</h4>
+               <div class="address_form__header">
+                  <h4>{{ $t('select_an_address') }}</h4>
+               </div>
 
-            <label for="isNoAddress">
-               <input type="checkbox"
-                  name="isNoAddress"
-                  v-bind:placeholder="$t('isNoAddress')"
-                  v-model="isNoAddress"
-                  v-bind:value="value"/>
-               {{ $t('isNoAddress') }}
-            </label>
+               <div class="address_form__select">
 
-            <country-selection
-               v-bind:address="address"
-               v-bind:getCities="getCities">
-            </country-selection>
+                  <div class="address_form__select__body">
+                     <label for="isNoAddress">
+                        <input type="checkbox"
+                           name="isNoAddress"
+                           v-bind:placeholder="$t('isNoAddress')"
+                           v-model="isNoAddress"
+                           v-bind:value="value"/>
+                        {{ $t('isNoAddress') }}
+                     </label>
 
-            <city-selection
-               v-bind:address="address"
-               v-bind:getReferenceAddresses="getReferenceAddresses">
-            </city-selection>
+                     <country-selection
+                        v-bind:address="address"
+                        v-bind:getCities="getCities">
+                     </country-selection>
 
-            <address-selection
-               v-bind:address="address"
-               v-bind:updateMapCenter="updateMapCenter">
-            </address-selection>
+                     <city-selection
+                        v-bind:address="address"
+                        v-bind:getReferenceAddresses="getReferenceAddresses">
+                     </city-selection>
 
-            <address-map
-               v-bind:address="address"
-               ref="addressMap">
-            </address-map>
+                     <address-selection
+                        v-bind:address="address"
+                        v-bind:updateMapCenter="updateMapCenter">
+                     </address-selection>
+                  </div>
 
-            <address-more
-               v-if="!isNoAddress"
-               v-bind:address="address">
-            </address-more>
+                  <div class="address_form__select__map">
+                     <address-map
+                        v-bind:address="address"
+                        ref="addressMap">
+                     </address-map>
+                  </div>
+               </div>
+
+               <div class="address_form__more">
+                  <address-more
+                     v-if="!isNoAddress"
+                     v-bind:address="address">
+                  </address-more>
+               </div>
+            </div>
 
             <!--
             <div class="address_form__fields__isNoAddress"></div>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressMap.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressMap.vue
index 2528f8e23..d78dfa1ec 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressMap.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressMap.vue
@@ -1,6 +1,6 @@
 <template>
    <div class="container">
-      <div id='address_map' style='height:400px; width:400px;'></div>
+      <div id='address_map'></div>
    </div>
 </template>
 
@@ -31,6 +31,7 @@ export default {
 
          const markerIcon = L.icon({
             iconUrl: markerIconPng,
+            iconAnchor: [12, 41],
          });
 
          marker = L.marker([48.8589, 2.3469], {icon: markerIcon}).addTo(map);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CitySelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CitySelection.vue
index 99e46db08..b9170ea35 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CitySelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CitySelection.vue
@@ -1,12 +1,12 @@
 <template>
    <div class="container">
-      <select 
+      <select
          v-model="selected">
          <option :value="{}" disabled selected>{{ $t('select_city') }}</option>
-         <option 
-            v-for="item in this.cities" 
-            v-bind:item="item" 
-            v-bind:key="item.id" 
+         <option
+            v-for="item in this.cities"
+            v-bind:item="item"
+            v-bind:key="item.id"
             v-bind:value="item">
             {{ item.code }}-{{ item.name }}
          </option>
@@ -20,8 +20,8 @@ export default {
    name: 'CitySelection',
    props: ['address', 'getReferenceAddresses'],
    computed: {
-      cities() { 
-         return this.address.loaded.cities; 
+      cities() {
+         return this.address.loaded.cities;
       },
       selected: {
          set(value) {