diff --git a/back/development.ini.template b/back/development.ini.template
index fe7a74ce..318dba2c 100644
--- a/back/development.ini.template
+++ b/back/development.ini.template
@@ -7,10 +7,10 @@
 use = egg:infolica
 
 infolica_url_base = http://127.0.0.1:8080/infolica
-infolica_mail = 
-admin_mail =
-infolica_smtp = 
-infolica_balance_mail = 
+infolica_mail = /*TO COMPLETE*/
+admin_mail = /*TO COMPLETE*/
+infolica_smtp = /*TO COMPLETE*/
+infolica_balance_mail = /*TO COMPLETE*/
 
 pyramid.reload_templates = true
 pyramid.debug_authorization = false
@@ -54,16 +54,6 @@ ldap_login_query_attributes= uid, givenName, sn, mail, telephoneNumber, mobile
 # Le scope de la recherche (LEVEL, SUBTREE)
 ldap_login_query_scope= SUBTREE
 
-# L'attribut qui correspond au login d'un utilisateur LDAP
-ldap_user_attribute_login= uid
-
-# Les autres attributs d'un utilisateur LDAP
-ldap_user_attribute_firstname= givenName
-ldap_user_attribute_lastname= sn
-ldap_user_attribute_telephone= telephoneNumber
-ldap_user_attribute_mail= mail
-ldap_user_attribute_mobile= mobile
-
 
 ###########################################################
 # La configuration de la recherche des groupes dans LDAP
diff --git a/back/infolica/models/models.py b/back/infolica/models/models.py
index 781e5594..57e1f8f2 100644
--- a/back/infolica/models/models.py
+++ b/back/infolica/models/models.py
@@ -33,7 +33,7 @@ class Operateur(Base):
     entree = Column(Date, default=datetime.datetime.utcnow, nullable=False)
     sortie = Column(Date)
     mail = Column(Text)
-
+    last_notemaj_id = Column(BigInteger)
 
 class Cadastre(Base):
     __tablename__ = 'cadastre'
diff --git a/back/infolica/routes.py b/back/infolica/routes.py
index 92498370..f5da3220 100644
--- a/back/infolica/routes.py
+++ b/back/infolica/routes.py
@@ -177,3 +177,4 @@ def includeme(config):
     #Notes de mise à jour
     config.add_route('notes_maj', '/infolica/api/notes_maj')
     config.add_route('version', '/infolica/api/version')
+    config.add_route('operateur_notes_maj', '/infolica/api/operateur_notes_maj')
diff --git a/back/infolica/views/default.py b/back/infolica/views/default.py
index 7503a5da..db6d7076 100644
--- a/back/infolica/views/default.py
+++ b/back/infolica/views/default.py
@@ -68,6 +68,7 @@ def test_error(exc, request):
 @view_config(route_name='controle_geometre', request_method='OPTIONS', renderer='json')
 @view_config(route_name='controle_geometre_s', request_method='OPTIONS', renderer='json')
 @view_config(route_name='save_document', request_method='OPTIONS', renderer='json')
+@view_config(route_name='operateur_notes_maj', request_method='OPTIONS', renderer='json')
 def options_response_view(request):
     """
     Common OPTION RESPONSE
diff --git a/back/infolica/views/notes_maj.py b/back/infolica/views/notes_maj.py
index 994753b7..d8d992b0 100644
--- a/back/infolica/views/notes_maj.py
+++ b/back/infolica/views/notes_maj.py
@@ -4,7 +4,7 @@
 
 from infolica.exceptions.custom_error import CustomError
 from infolica.models.constant import Constant
-from infolica.models.models import NotesMAJ
+from infolica.models.models import NotesMAJ, Operateur
 from infolica.scripts.utils import Utils
 
 from datetime import date, datetime
@@ -19,13 +19,14 @@ def notes_maj_view(request):
     if not Utils.check_connected(request):
         raise exc.HTTPForbidden()
     
-    active = request.params["active"] if "active" in request.params else "false"
-    
+    lastNoteMaj_id = request.params ["lastNoteMaj_id"] if "lastNoteMaj_id" in request.params else None
+
     query = request.dbsession.query(NotesMAJ)
     
-    if active == "true":
-        today = date.today()
-        query = query.filter(NotesMAJ.delai - today >= 0)
+    if not lastNoteMaj_id is None:
+        if lastNoteMaj_id == 'null':
+            lastNoteMaj_id = 0
+        query = query.filter(NotesMAJ.id > lastNoteMaj_id)
 
     query = query.order_by(NotesMAJ.id.desc()).all()
 
@@ -39,12 +40,14 @@ def version_view(request):
     """
     model_version = request.dbsession.query(NotesMAJ).order_by(NotesMAJ.version.desc()).first()
     model_delai = request.dbsession.query(NotesMAJ).order_by(NotesMAJ.delai.desc()).first()
+    model_lastId = request.dbsession.query(NotesMAJ).order_by(NotesMAJ.id.desc()).first()
 
     now = datetime.now()
 
     version = {
         'version': model_version.version,
-        'isNew': datetime.combine(model_delai.delai, datetime.min.time()) >= now
+        'isNew': datetime.combine(model_delai.delai, datetime.min.time()) >= now,
+        'lastId': model_lastId.id
     }
 
     return version
@@ -116,3 +119,28 @@ def notes_maj_delete_view(request):
     request.dbsession.delete(model)
 
     return Utils.get_data_save_response(Constant.SUCCESS_DELETE.format(NotesMAJ.__tablename__))
+
+
+@view_config(route_name='operateur_notes_maj', request_method='PUT', renderer='json')
+def operateur_notes_maj_update_view(request):
+    """
+    Update last seen notes_maj in operateur
+    """
+    # Check authorization
+    if not Utils.check_connected(request):
+        raise exc.HTTPForbidden()
+
+    # Get operateur_id
+    operateur_id = request.params['operateur_id'] if 'operateur_id' in request.params else None
+    last_notes_maj_id = request.params['last_notes_maj_id'] if 'last_notes_maj_id' in request.params else None
+
+    model = request.dbsession.query(Operateur).filter(Operateur.id == operateur_id).first()
+
+    # If result is empty
+    if not model:
+        raise CustomError(CustomError.RECORD_WITH_ID_NOT_FOUND.format(Operateur.__tablename__, operateur_id))
+
+    # Read params operateur
+    model.last_notemaj_id = last_notes_maj_id
+
+    return Utils.get_data_save_response(Constant.SUCCESS_SAVE.format(Operateur.__tablename__))
\ No newline at end of file
diff --git a/back/production.ini.template b/back/production.ini.template
index 4de34318..d38c27b0 100644
--- a/back/production.ini.template
+++ b/back/production.ini.template
@@ -52,12 +52,6 @@ ldap_login_query_attributes= /*TO COMPLETE*/
 # Le scope de la recherche (LEVEL, SUBTREE)
 ldap_login_query_scope= SUBTREE
 
-# Les autres attributs d'un utilisateur LDAP
-ldap_user_attribute_firstname= givenName
-ldap_user_attribute_lastname= sn
-ldap_user_attribute_telephone= telephoneNumber
-ldap_user_attribute_mail= mail
-
 
 ###########################################################
 # La configuration de la recherche des groupes dans LDAP
@@ -192,7 +186,7 @@ facture_type_facture_id = 1
 client_cadastration_id = 2896
 
 # Opérateurs à contacter pour les affaires urgentes
-operateur_affaire_urgente = 9,15,21,35,39,45,59,60
+operateur_affaire_urgente = 15,21,57,59,60
 
 ######################################################################################
 # Accès dossiers
diff --git a/front/.env b/front/.env
index 6095dfef..20c4e32f 100644
--- a/front/.env
+++ b/front/.env
@@ -2,7 +2,7 @@
 VUE_APP_API_URL="__url/to/api__"
 
 PUBLIC_PATH = "/infolica"
-VUE_APP_STATUS = "developpement"
+VUE_APP_STATUS = "development"
 VUE_APP_VERSION = "1.0"
 
 #=====================================
@@ -88,6 +88,8 @@ VUE_APP_SERVICES_ENDPOINT = "/services/"
 VUE_APP_FACTURE_ENDPOINT = "/factures/"
 VUE_APP_EMOLUMENTS_ENDPOINT = "/emoluments"
 VUE_APP_EMOLUMENTS_FACTURE_ENDPOINT = "/emolument_facture"
+VUE_APP_EMOLUMENT_AFFAIRE_ENDPOINT = "/emolument_affaire"
+VUE_APP_EMOLUMENT_ENDPOINT = "/emolument"
 
 #Etapes de l'affaire
 VUE_APP_ETAPES_INDEX_ENDPOINT = "/etapes_index/"
@@ -161,6 +163,7 @@ VUE_APP_RELPATH_DESIGNATIONS_ENDPOINT = "/A_Administratif/Désignations"
 #Notes de mise à jour programme
 VUE_APP_NOTESMAJ_ENDPOINT = "/notes_maj"
 VUE_APP_VERSION_ENDPOINT = "/version"
+VUE_APP_OPERATEUR_LASTNOTEMAJ_ENDPOINT = "/operateur_notes_maj"
 
 #=====================================
 #========    FORMATS DATES    ========
diff --git a/front/src/components/Affaires/NumerosAffaire/NumerosAffaire.vue b/front/src/components/Affaires/NumerosAffaire/NumerosAffaire.vue
index 76cef8a1..6624b81e 100644
--- a/front/src/components/Affaires/NumerosAffaire/NumerosAffaire.vue
+++ b/front/src/components/Affaires/NumerosAffaire/NumerosAffaire.vue
@@ -483,6 +483,7 @@ export default {
         
         numeros_references_card: [
           this.typesAffaires_conf.cadastration,
+          this.typesAffaires_conf.pcop,
           this.typesAffaires_conf.ppe,
           this.typesAffaires_conf.mat_diff,
           this.typesAffaires_conf.revision_abornement,
diff --git a/front/src/components/Header/Header.vue b/front/src/components/Header/Header.vue
index 6a2b7877..df57375a 100644
--- a/front/src/components/Header/Header.vue
+++ b/front/src/components/Header/Header.vue
@@ -81,8 +81,7 @@ export default {
      */
     openNotesMAJ() {
       this.$root.$emit("openNotesMAJ");
-    }
-
+    },
   },
 
   mounted: function(){
diff --git a/front/src/components/Login/Login.vue b/front/src/components/Login/Login.vue
index 18ce5624..15c8d2de 100644
--- a/front/src/components/Login/Login.vue
+++ b/front/src/components/Login/Login.vue
@@ -4,7 +4,7 @@
 
 <script>
 import {handleException} from '@/services/exceptionsHandler';
-import {checkPermission, setCurrentUserFunctions} from '@/services/helper';
+import {setCurrentUserFunctions} from '@/services/helper';
 
 export default {
   name: 'Login',
@@ -16,85 +16,106 @@ export default {
   },
   methods:{
 
-        /**
-         * Login
-         */
-        async doLogin () {
-            this.showProgess = true;
-            var formData = new FormData();
-            formData.append("login", this.$refs.username.value);
-            formData.append("password", this.$refs.userpass.value);
+    /**
+     * Login
+     */
+    async doLogin () {
+        this.showProgess = true;
+        var formData = new FormData();
+        formData.append("login", this.$refs.username.value);
+        formData.append("password", this.$refs.userpass.value);
+
+        this.$http.post(
+          process.env.VUE_APP_API_URL + process.env.VUE_APP_LOGIN_ENDPOINT, 
+          formData,
+          {
+            withCredentials: true,
+            headers: {"Accept": "application/json"}
+          }
+        )
+        .then(response =>{
+          if(response && response.data && response.data.id){
+            this.processLogin(response.data);
+            this.$router.push({ name: "Cockpit"});
+          } else {
+            this.showProgess = false;
+            this.$refs.userpass.value = "";
+            this.$root.$emit("ShowError", "Le nom d'utilisateur ou le mot de passe est incorrect")
+          }
+        })
+        //Error 
+        .catch(err => {
+          this.showProgess = false;
+          handleException(err, this);
+        })
+      },
+      
+      /**
+       * Logout
+       */
+      async doLogout () {
+        this.$http.get(
+          process.env.VUE_APP_API_URL + process.env.VUE_APP_LOGOUT_ENDPOINT, 
+          {
+            withCredentials: true,
+            headers: {"Accept": "application/json"}
+          }
+        )
+        .then(() =>{
+          localStorage.removeItem('infolica_user');
+        })
+        //Error 
+        .catch(err => {
+          handleException(err, this);
+        })
+      },
 
-            this.$http.post(
-              process.env.VUE_APP_API_URL + process.env.VUE_APP_LOGIN_ENDPOINT, 
-              formData,
-              {
-                withCredentials: true,
-                headers: {"Accept": "application/json"}
-              }
-            )
-            .then(response =>{
-              if(response && response.data && response.data.id){
-                this.processLogin(response.data);
-                this.$router.push({ name: "Cockpit"});
-              } else {
-                this.showProgess = false;
-                this.$refs.userpass.value = "";
-                this.$root.$emit("ShowError", "Le nom d'utilisateur ou le mot de passe est incorrect")
-              }
-            })
-            //Error 
-            .catch(err => {
-              this.showProgess = false;
-              handleException(err, this);
-            })
-          },
-          
-          /**
-           * Logout
-           */
-          async doLogout () {
-            this.$http.get(
-              process.env.VUE_APP_API_URL + process.env.VUE_APP_LOGOUT_ENDPOINT, 
-              {
-                withCredentials: true,
-                headers: {"Accept": "application/json"}
-              }
-            )
-            .then(() =>{
-              localStorage.removeItem('infolica_user');
-            })
-            //Error 
-            .catch(err => {
-              handleException(err, this);
-            })
-          },
 
+      /**
+       * Process login
+       */
+      processLogin (data) {
+        localStorage.setItem('infolica_user', JSON.stringify(data));
+        setCurrentUserFunctions().then(() => {
+          this.$root.$emit("notesMaj_hasAdminRights");
+        });
+        this.$root.$emit('infolica_user_logged_in', data);
+      },
 
-          /**
-           * Process login
-           */
-          processLogin (data) {
-            localStorage.setItem('infolica_user', JSON.stringify(data));
-            setCurrentUserFunctions().then(() => {
-              this.$root.$emit("notesMaj_hasAdminRights", checkPermission(process.env.VUE_APP_FONCTION_ADMIN));
-            });
-            this.$root.$emit('infolica_user_logged_in', data);
-          },
+      /**
+       * Process logout
+       */
+      processLogout () {
+        localStorage.setItem('infolica_user', null);
+        this.$root.$emit('notesMaj_set_default_params');
+        this.$root.$emit('infolica_user_logged_out');
 
-          /**
-           * Process logout
-           */
-          processLogout () {
-            localStorage.setItem('infolica_user', null);
-            this.$root.$emit('infolica_user_logged_out');
+        if(this.$router && this.$router.currentRoute && this.$router.currentRoute.name != 'Login')
+          this.$router.push({ name: "Login"});
+      },
 
-            if(this.$router && this.$router.currentRoute && this.$router.currentRoute.name != 'Login')
-              this.$router.push({ name: "Login"});
+      /**
+       * get version of Infolica
+       */
+      async getVersion() {
+        this.$http.get(
+          process.env.VUE_APP_API_URL + process.env.VUE_APP_VERSION_ENDPOINT,
+          {
+            withCredentials: true,
+            headers: {"Accept": "application/json"}
           }
+        ).then(response => {
+          if (response && response.data) {
+            this.$root.$emit("checkVersion", response.data.version, false);
+          }
+        }).catch(err => handleException(err));
+      },
+
     },
 
     mounted: function(){
+      this.getVersion();
+
       //Logout
       this.$root.$on("infolica_user_logout", () => {        
         this.doLogout();    
diff --git a/front/src/components/Main/main.css b/front/src/components/Main/main.css
index 3fdcb0db..79bae5d3 100644
--- a/front/src/components/Main/main.css
+++ b/front/src/components/Main/main.css
@@ -1,5 +1,4 @@
 .main{
-    height: calc(100% - 60px);
     width: 100%;
     float: left;
     padding: 0px 10px 10px 10px;
diff --git a/front/src/components/Main/main.html b/front/src/components/Main/main.html
index dccf6cda..c229582a 100644
--- a/front/src/components/Main/main.html
+++ b/front/src/components/Main/main.html
@@ -1,3 +1,3 @@
-<div class="main">
+<div class="main" id="main">
     <router-view />
 </div>
\ No newline at end of file
diff --git a/front/src/components/NotesMAJ/NotesMAJ.vue b/front/src/components/NotesMAJ/NotesMAJ.vue
index 00d4545c..a1a9a5bf 100644
--- a/front/src/components/NotesMAJ/NotesMAJ.vue
+++ b/front/src/components/NotesMAJ/NotesMAJ.vue
@@ -4,7 +4,7 @@
 
 <script>
 import {handleException} from '@/services/exceptionsHandler'
-import {disabledDates_fct} from '@/services/helper'
+import {disabledDates_fct, checkPermission} from '@/services/helper'
 const moment = require('moment');
 
 export default {
@@ -12,6 +12,7 @@ export default {
   props: {},
   data: () => {
     return {
+      currentVersion: {},
       disabledDates: disabledDates_fct,
       newNote: {
         show: false,
@@ -20,19 +21,20 @@ export default {
         message: null,
         delai: null,
       },
+      mustUpdateLastVersionOperateur: false,
       notes: [],
       permissions : {
         admin: false
       },
-      showNotesMAJ: true,
+      showNotesMAJ: false,
     }
   },
   methods: {
     /**
      * Get Notes
      */
-    getNotesMAJ() {
-      this.$http.get(process.env.VUE_APP_API_URL + process.env.VUE_APP_NOTESMAJ_ENDPOINT + "?active=true",
+    getNotesMAJ(operateur_lastNoteMaj) {
+      this.$http.get(process.env.VUE_APP_API_URL + process.env.VUE_APP_NOTESMAJ_ENDPOINT + "?lastNoteMaj_id=" + String(operateur_lastNoteMaj),
         {
           withCredentials: true,
           headers: {"Accept": "application/json"}
@@ -56,17 +58,20 @@ export default {
      * Get version
      */
     getVersion() {
-      this.$http.get(
-        process.env.VUE_APP_API_URL + process.env.VUE_APP_VERSION_ENDPOINT,
-        {
-          withCredentials: true,
-          headers: {"Accept": "application/json"}
-        }
-      ).then(response => {
-        if (response && response.data) {
-          this.$root.$emit("checkVersion", response.data.version, response.data.isNew);
-        }
-      }).catch(err => handleException(err, this));
+      return new Promise ((resolve, reject) => {
+        this.$http.get(
+          process.env.VUE_APP_API_URL + process.env.VUE_APP_VERSION_ENDPOINT,
+          {
+            withCredentials: true,
+            headers: {"Accept": "application/json"}
+          }
+        ).then(response => {
+          if (response && response.data) {
+            this.$root.$emit("checkVersion", response.data.version, false);
+            resolve(response);
+          }
+        }).catch(err => reject(err));
+      });
     },
 
     /**
@@ -76,6 +81,7 @@ export default {
       if(this.$router && this.$router.currentRoute && this.$router.currentRoute.name != route) {
         this.$router.push({ name: route});
         this.showNotesMAJ = false;
+        this.updateMainDivHeight();
       }
     },
 
@@ -132,8 +138,8 @@ export default {
       ).then(response => {
         if (response && response.data) {
           this.$root.$emit("ShowMessage", "La note de mise à jour a bien été enregistrée");
-          this.getNotesMAJ();
-          this.getVersion();
+          this.compareOperateurVersionWithCurrentVersion();
+          this.mustUpdateLastVersionOperateur = true;
         }
       }).catch(err => handleException(err, this));
 
@@ -144,19 +150,144 @@ export default {
         message: null,
         delai: null,
       };
+    },
+
+    /**
+     * get permissions
+     */
+    getPermissions() {
+      this.permissions.admin = checkPermission(process.env.VUE_APP_FONCTION_ADMIN);
+    },
+
+    /**
+     * Get operateur by id
+     */
+    async getOperateurById() {
+      return new Promise ((resolve, reject) => {
+        this.$http.get(
+          process.env.VUE_APP_API_URL + process.env.VUE_APP_OPERATEURS_ENDPOINT + "/" + JSON.parse(localStorage.getItem("infolica_user")).id,
+          {
+            withCredentials: true,
+            headers: {"Accept": "application/json"}
+          }
+        ).then(response => {
+          if (response && response.data) {
+            resolve(response);
+          }
+        }).catch(err => reject(err));
+      });
+    },
+
+    /**
+     * Compare last version in operateur with current version
+     */
+    async compareOperateurVersionWithCurrentVersion() {
+      let promises = [];
+      promises.push(this.getOperateurById());
+      promises.push(this.getVersion());
+
+      let operateur_lastMajNote = null;
+      Promise.all(promises).then(response => {
+        operateur_lastMajNote = response[0].data.last_notemaj_id;
+        this.currentVersion = response[1].data;
+        if (operateur_lastMajNote !== this.currentVersion.lastId) {
+          this.$root.$emit("checkVersion", this.currentVersion.version, this.currentVersion.isNew);
+          this.getNotesMAJ(operateur_lastMajNote);
+          this.showNotesMAJ = true;
+          this.mustUpdateLastVersionOperateur = true;
+        } else {
+          this.$root.$emit("checkVersion", this.currentVersion.version, false);
+          this.mustUpdateLastVersionOperateur = false;
+          this.notes = [];
+        }
+
+        // set main_div height
+        this.updateMainDivHeight();
+
+      });
+
+      this.getOperateurById().then(response => {
+        if (response && response.data) {
+          operateur_lastMajNote = response.data.lastVersion;
+        }
+      }).catch(err => handleException(err, this));
+    },
+
+    /**
+     * update div "main" height
+     */
+    updateMainDivHeight() {
+      if (this.showNotesMAJ) {
+        // recursively check untill element notesmaj is ready
+        const interval = setInterval(() => {
+          let div_notesmaj = document.getElementById('notesmaj');
+          if (div_notesmaj) {
+            document.getElementById('main').setAttribute("style","height: calc(100% - " + String(div_notesmaj.offsetHeight + 9) + "px)");
+            clearInterval(interval);
+          }
+          return;
+        }, 200);
+
+      } else {
+        document.getElementById('main').setAttribute("style","height: calc(100% - 60px)");
+      }
+    },
+
+    /**
+     * closeInfobulle with saving lastId notes MAJ
+     */
+    async closeAndSaveInfobulle() {
+      if (this.mustUpdateLastVersionOperateur) {
+        let formData = new FormData();
+        formData.append("operateur_id", JSON.parse(localStorage.getItem("infolica_user")).id);
+        formData.append("last_notes_maj_id", this.currentVersion.lastId);
+
+        this.$http.put(
+          process.env.VUE_APP_API_URL + process.env.VUE_APP_OPERATEUR_LASTNOTEMAJ_ENDPOINT,
+          formData,
+          {
+            withCredentials: true,
+            headers: {"Accept": "application/json"}
+          }
+        ).then(response => {
+          if (response && response.data) {
+            this.compareOperateurVersionWithCurrentVersion();
+          }
+        }).catch(err => handleException(err, this));
+      }
+
+      // fermer l'infobulle et setter la hauteur du div main
+      this.closeInfobulle();
+    },
+
+    /**
+     * close infobulle
+     */
+    closeInfobulle() {
+      // fermer l'infobulle
+      this.showNotesMAJ = false;
+      //set main_div height
+      this.updateMainDivHeight();
     }
+
   },
+
   mounted: function(){
     this.getVersion();
+    this.getPermissions();
     
-    this.$root.$on("openNotesMAJ", () => this.showNotesMAJ = true);
-    
-    this.$root.$on("notesMaj_hasAdminRights", (hasAdminRights) => {
-      this.permissions.admin = hasAdminRights;
-      this.getNotesMAJ();
-      this.getVersion();
+    if (JSON.parse(localStorage.getItem("infolica_user")) && JSON.parse(localStorage.getItem("infolica_user")).id) {
+      this.compareOperateurVersionWithCurrentVersion();
+    }
+
+    this.$root.$on("openNotesMAJ", () => {this.compareOperateurVersionWithCurrentVersion(); this.showNotesMAJ=true;});
+    this.$root.$on("notesMaj_set_default_params", () => this.showNotesMAJ = false);
+
+    this.$root.$on("notesMaj_hasAdminRights", () => {
+      this.getPermissions();
+      this.compareOperateurVersionWithCurrentVersion();
     });
-  }
+  },
 }
 </script>
 
diff --git a/front/src/components/NotesMAJ/notesMAJ.html b/front/src/components/NotesMAJ/notesMAJ.html
index 118dfbd6..83153b08 100644
--- a/front/src/components/NotesMAJ/notesMAJ.html
+++ b/front/src/components/NotesMAJ/notesMAJ.html
@@ -1,10 +1,10 @@
-<div class="notesmaj" v-if="showNotesMAJ">
+<div class="notesmaj" v-if="showNotesMAJ" id="notesmaj">
     <md-card class="notesMAJ" v-if="$route.name !== 'Login' && showNotesMAJ">
         <md-card-header class="justifyTitleBtn" style="padding-bottom: 0px;">
-            <div class="md-title"><b>Mise à jour</b></div>
+            <div class="md-title"><b>Information</b></div>
             <div>
                 <md-button style="min-width: auto; width: auto;" title="Ajouter une note de mise à jour" @click="openNewNote" class="md-dense" v-if="permissions.admin"><md-icon>add</md-icon></md-button>
-                <md-button style="min-width: auto; width: auto;" title="Fermer la fenêtre d'informations" @click="showNotesMAJ=false" class="md-dense"><md-icon>close</md-icon></md-button>
+                <md-button style="min-width: auto; width: auto;" title="Fermer la fenêtre d'informations" @click="closeInfobulle" class="md-dense"><md-icon>close</md-icon></md-button>
             </div>
         </md-card-header>
         <md-card-content>
@@ -33,7 +33,7 @@ <h3>Ajouter une note de mise à jour</h3>
                 </div>
             </div>
             <div v-if="notes.length > 0">
-                <p>La dernière mise à jour comporte les éléments suivants:</p>
+                <p>Voici mises à jour apportées depuis votre dernière connexion à Infolica:</p>
                 <ul style="margin-top: 0px;">
                     <li v-for="item in notes" :title="item.title">{{ item.titre }}: {{ item.message }}</li>
                 </ul>
@@ -41,7 +41,17 @@ <h3>Ajouter une note de mise à jour</h3>
             <div v-else>
                 <p><em>Il n'y a pas de mise à jour</em></p>
             </div>
-            <p><a @click="goTo('About')">Consulter l'historique</a></p>
+            <div style="display: flex; flex-direction: row; flex-wrap: nowrap; justify-content: space-between;">
+                <div>
+                    <p><a @click="goTo('About')">Consulter l'historique</a></p>
+                </div>
+                <div>
+                    <md-button class="md-dense md-primary md-raised" @click="closeAndSaveInfobulle()" title="Ne plus afficher l'information">
+                        <md-icon>thumb_up</md-icon>
+                        <span style="display: inline-block; height: 13px; vertical-align: middle; margin-left: 5px;"> J'ai compris</span>
+                    </md-button>
+                </div>
+            </div>
         </md-card-content>
     </md-card>
 </div>
\ No newline at end of file