diff --git a/assets/Manuscript.pdf b/assets/Manuscript.pdf
new file mode 100644
index 0000000..444c906
Binary files /dev/null and b/assets/Manuscript.pdf differ
diff --git a/index.html b/index.html
index 414ae88..5ab93e7 100644
--- a/index.html
+++ b/index.html
@@ -27,7 +27,7 @@
             <div class="container">
 
                 <!-- Brand -->
-                <a class="navbar-brand waves-effect" href="https://qrouland.com" target="_blank">
+                <a class="navbar-brand waves-effect" >
                     <strong class="blue-text">Quentin Rouland</strong>
                 </a>
 
@@ -113,7 +113,7 @@
                         <!-- Title -->
                         <h4 class="card-title"><strong>Quentin Rouland</strong></h4>
                         <!-- Subtitle -->
-                        <h6 class="font-weight-bold indigo-text py-2" data-i18n="about.job"></h6>
+                        <h6 class="font-weight-bold indigo-text py-2" data-i18n="[html]about.job"></h6>
                         <!-- Social -->
                         <div class="pb-2">
                             <a href="mailto:quentin@qrouland.com" target="_blank">
@@ -136,9 +136,18 @@
                             </a>
                         </div>
                         <!-- Text -->
-                        <p class="card-text">.
+                        <p class="card-text">
                             <span data-i18n="[html]about.location"></span>
                         </p>
+                        <!--p class="card-text">
+                            Curriculum Vitae <br/>
+                            <a id="ukflag" href="javascript:i18next.changeLanguage('en');">
+                                <i class="uk flag"></i>
+                            </a>
+                            <a id="frflag" href="javascript:i18next.changeLanguage('fr');">
+                                <i class="france flag"></i>
+                            </a-->
+                        </p>
                       </div>
 
                     </div>
@@ -172,21 +181,17 @@
                     <h3 class="mb-3 font-weight-bold dark-grey-text">
                         <strong data-i18n="experiences.title"></strong>
                     </h3>
-					<p class="mb-3 text-justify"><i class="fas fa-angle-right mr-2"></i>
+                    <p class="mb-3 text-justify"><i class="fas fa-angle-right mr-2"></i>
                         <strong data-i18n="experiences.carleton.title"></strong><br>
                         <span class="pl-3 font-small" data-i18n="[html]experiences.carleton.location"></span><br>
                     </p>
-					<p class="mb-3 text-justify"><i class="fas fa-angle-right mr-2"></i>
+                     <p class="mb-3 text-justify"><i class="fas fa-angle-right mr-2"></i>
                         <strong data-i18n="experiences.ater.title"></strong><br>
                         <span class="pl-3 font-small" data-i18n="[html]experiences.ater.location"></span><br>
-                        <span class="pl-3" data-i18n="experiences.ater.exp1"></span><br>
-                        <span class="pl-3" data-i18n="experiences.ater.exp2"></span><br>
                     </p>
 					<p class="mb-3 text-justify"><i class="fas fa-angle-right mr-2"></i>
                         <strong data-i18n="experiences.phd.title"></strong><br>
                         <span class="pl-3 font-small" data-i18n="[html]experiences.phd.location"></span><br>
-                        <span class="pl-3" data-i18n="experiences.phd.exp1"></span><br>
-                        <span class="pl-3" data-i18n="experiences.phd.exp2"></span><br>
                     </p>
                     <p class="mb-3 text-justify"><i class="fas fa-angle-right mr-2"></i>
                         <strong data-i18n="experiences.engie.title"></strong> <br>
@@ -227,7 +232,7 @@
                     <p class="mb-3 text-justify"><i class="fas fa-angle-right mr-2"></i>
                         <strong data-i18n="training.phd.title"></strong><br>
                         <span class="pl-3 font-small" data-i18n="[html]training.phd.location"></span>
-                    </p>    
+                    </p>       
                     <p class="mb-3 text-justify"><i class="fas fa-angle-right mr-2"></i>
                         <strong data-i18n="training.ice.title"></strong><br>
                         <span class="pl-3 font-small" data-i18n="[html]training.ice.location"></span>
@@ -311,7 +316,11 @@
                     <h3 class="mb-3 font-weight-bold dark-grey-text">
                         <strong data-i18n="publications.these"></strong>
                     </h3>
-                    <p class="grey-text" data-i18n="publications.nothing"></p>                
+                      </h3>
+                   <p class="mb-2 text-justify">
+                        <i class="fas fa-angle-right mr-2"></i><strong>Quentin Rouland</strong>. <a class="text-primary" href="/assets/Manuscript.pdf">Rigorous development of secure architecture within the negative and positive statements: properties, models, analysis and tool support</a>.<br>
+                        <span class="pl-3">PhD Thesis, Université Toulouse 3 Paul Sabatier, 2021.</span>
+                    </p>             
                 </div>
                 <!--Grid column-->
 
@@ -323,6 +332,17 @@
 
         <!-- Teachings container-->
         <div class="container" id="teachings" style="display:none;">
+			            <!--Grid row-->
+            <div class="row wow fadeIn mb-3">
+                <!--Grid column-->
+                <div mb-4">
+                    <h3 class="mb-3 font-weight-bold dark-grey-text">
+                        <strong>2020-2021</strong><span class="font-weight-light" data-i18n="teachings.univtoulouse2"></span>
+                    </h3>                      
+                </div>
+                <!--Grid column-->
+
+            </div>
             <!--Grid row-->
             <div class="row wow fadeIn mb-3">
                 <!--Grid column-->
diff --git a/js/translate.js b/js/translate.js
index 3c75214..a4b9135 100644
--- a/js/translate.js
+++ b/js/translate.js
@@ -14,7 +14,7 @@ i18next
 					projects: "Projects"
 				},
 				about: {
-					job : "Postdoctoral Researcher in IT",
+					job : "Postdoctoral Researcher <br>Computer Science",
 					p1: "After following training courses focused on software development at the <a href='https://www.univ-tlse2.fr/home/' class='text-primary'>University of Toulouse 2 Jean-Jaurès</a> " +
 						"and obtained a <a href='https://www.univ-tlse2.fr/accueil/navigation/formation-insertion/formation-continue/master-informatique-collaborative-en-entreprise-ice-1e-et-2e-annee-444876.kjsp'>" +
 						"sandwich course master's degree in Collaborative Computer Science</a>. Then, completed a PhD in Computer Science at <a href='https://www.univ-tlse3.fr/'>University Toulouse 3 Paul Sabatier</a> " +
@@ -34,22 +34,23 @@ i18next
 					title: "Professionnal Experiences",
                     carleton : {
                         title: "2021-present - Postdoctoral Fellow",
-                        location: "<a href='https://carleton.ca/'>Carleton University</a>, Ottawa, Canada"
+                        location: "<a href='https://carleton.ca/'>Carleton University</a> at <a href='https://carleton.ca/cybersea/'>CyberSEA</a> Research Lab, Ottawa, Canada"
                     },
-					ater: {
-						title: "2020-2021 (1 year) -  Temporary Lecturer and Research Assistant",
-						location: "<a href='https://www.univ-tlse2.fr/home/'>University Toulouse 2 Jean-Jaurés</a> at <a href='https://www.irit.fr/?lang=en'>IRIT</a>, Toulouse, France (31)",
-                        exp1: "Computer science research - Rigorous Development of Secure Software Architectures : Security / Model Driven Engineering  / Formal Methods ",
-                        exp2: "Teaching - 192h / year",
-					},
-                    phd: {
-                        title: "2017-2020 (3 years) - Phd Student",
-						location: "<a href='https://www.univ-tlse3.fr/'>University Toulouse 3 Paul Sabatier</a> at <a href='https://www.irit.fr/?lang=en'>IRIT</a>, Toulouse, France (31)",
+					phd: {
+                        title: "2017-2020 - Phd Student",
+						location: "<a href='https://www.univ-tlse3.fr/'>University Toulouse 3 Paul Sabatier</a> at <a href='https://www.irit.fr/?lang=en'>IRIT</a> Research Lab, Toulouse, France (31)",
                         exp1: "Computer science research - Rigorous Development of Secure Software Architectures : Security / Model Driven Engineering  / Formal Methods",
                         exp2: "Teaching - 76h / year",
                     },
+					ater: {
+						title: "2020-2021 -  Temporary Lecturer and Research Assistant",
+						location: "<a href='https://www.univ-tlse2.fr/home/'>University Toulouse 2 Jean-Jaurés</a> at <a href='https://www.irit.fr/?lang=en'>IRIT</a> Research Lab, Toulouse, France (31)",
+                        exp1: "Computer science research - Rigorous Development of Secure Software Architectures : Security / Model Driven Engineering  / Formal Methods ",
+                        exp2: "Teaching - 192h / year",
+					},
+
 					engie: {
-						title: "2015-2017 (2 years) - Sandwich Course Master Degree",
+						title: "2015-2017 - Sandwich Course Master Degree",
 						location: "<a href='https://www.engie-ineo.fr/en/'>Engie Ineo</a>, Toulouse, France (31)",
 						exp1: "Installation, configuration, securing Linux OS  - CentOS / Bash",
 						exp2: "Set Up Virtual Machines and Networks - KVM / Open VSwitch",
@@ -57,7 +58,7 @@ i18next
 						exp4: "Operational Continuity Support on Industrial SCADA System - C++ / Qt / Python",
 					},
 					freescale: {
-						title: "2015 (4 months) - Bachelor Degree Internship",
+						title: "2015 - Bachelor Degree Internship",
 						location: "<a href='https://www.nxp.com/'>Freescale Semiconducteur</a>, Toulouse, France (31)",
 						exp1: "Creation of a Web Service for the Processing and Publication of Testing Data.",
 						exp2: "Python [Django, Panda] / HTML / Js [D3.js, JQuery] / CSS",
@@ -72,7 +73,7 @@ i18next
 				training: {
 					title: "Training",
                     phd: {
-						title: "2017-2021 (4 years) - PhD in IT",
+						title: "2017-2021 - PhD in Computer Science",
 						location: "<a href='https://www.univ-tlse3.fr/'>University Toulouse 3 Paul Sabatier</a> at <a href='https://www.irit.fr/?lang=en'>IRIT</a>, Toulouse, France (31)",
 					},
 					ice: {
@@ -99,6 +100,7 @@ i18next
 					nothing: "Soon !"
 				},
 				teachings: {
+					univtoulouse2: " - University Toulouse 2 Jean-Jaurés",
 					univtoulouse3: " - University Toulouse 3 Paul Sabatier"
 				},
 				projects: {
@@ -117,7 +119,7 @@ i18next
 					projects: "Projets"
 				},
 				about: {
-					job: "Chercheur Postdoctoral en Informatique",
+					job: "Chercheur Postdoctoral <br>Informatique",
 					p1: "Après avoir suivi un parcours orienté développement logiciel à l'<a href='https://www.univ-tlse2.fr/' class='text-primary'>Université Toulouse 2 Jean-Jaurès</a> " +
 						"et obtenu un <a href='https://www.univ-tlse2.fr/accueil/navigation/formation-insertion/formation-continue/master-informatique-collaborative-en-entreprise-ice-1e-et-2e-annee-444876.kjsp'>" +
 						"Master en Informatique Collaborative en Entreprise</a> en alternance. Puis réaliser un doctorat en Informatique à l'<a href='https://www.univ-tlse3.fr/'>Université Toulouse 3 Paul Sabatier</a> " +
@@ -137,22 +139,22 @@ i18next
 					title: "Expériences Professionelles",
                     carleton : {
                         title: "2021-présent - Chercheur Postdoctoral",
-                        location: "<a href='https://carleton.ca/'>Université Carleton</a>, Ottawa, Canada"
+                        location: "<a href='https://carleton.ca/'>Université Carleton</a> / <a href='https://carleton.ca/cybersea/'>CyberSEA</a>, Ottawa, Canada"
                     },
-					ater: {
-						title: "2020-2021 (1 an) - Attaché temporaire d'enseignement et de recherche",
-						location: "<a href='https://www.univ-tlse2.fr/home/'>Université Toulouse 2 Jean-Jaurés</a> / <a href='https://www.irit.fr/?lang=en'>IRIT</a>, Toulouse, France (31)",
-                        exp1: "Recherche en informatique - Développement Rigoureux des Architectures Logicielles Sécurisées : Sécurité / Ingénierie Dirigée par les Modèles / Méthodes Formelle",
-                        exp2: "Enseignement - 192h équivalent TD / an",
-					},
                     phd: {
-                        title: "2017-2020 (3 ans) - Doctorant contractuel",
+                        title: "2017-2020 - Doctorant contractuel",
 						location: "<a href='https://www.univ-tlse3.fr/'>Université Toulouse 3 Paul Sabatier</a> / <a href='https://www.irit.fr/?lang=en'>IRIT</a>, Toulouse, France (31)",
                         exp1: "Recherche en informatique - Développement Rigoureux des Architectures Logicielles Sécurisées : Sécurité / Ingénierie Dirigée par les Modèles / Méthodes Formelle",
                         exp2: "Enseignement - 64h équivalent TD / an",
                     },
+					ater: {
+						title: "2020-2021 - Attaché temporaire d'enseignement et de recherche",
+						location: "<a href='https://www.univ-tlse2.fr/home/'>Université Toulouse 2 Jean-Jaurés</a> / <a href='https://www.irit.fr/?lang=en'>IRIT</a>, Toulouse, France (31)",
+                        exp1: "Recherche en informatique - Développement Rigoureux des Architectures Logicielles Sécurisées : Sécurité / Ingénierie Dirigée par les Modèles / Méthodes Formelle",
+                        exp2: "Enseignement - 192h équivalent TD / an",
+					},
 					engie: {
-						title: "2015-2017 (2 ans) - Alternance Master ICE",
+						title: "2015-2017 - Alternance Master ICE",
 						location: "<a href='https://www.engie-ineo.fr/'>Engie Ineo</a>, Toulouse, France (31)",
 						exp1: "Installation, configuration, sécurisation d’OS Linux  - CentOS / Bash",
 						exp2: "Mise en Place de Machines et Réseau Virtuelle - KVM / Open VSwitch",
@@ -160,7 +162,7 @@ i18next
 						exp4: "MCO Système Industriel SCADA - C++ / Qt / Python",
 					},
 					freescale: {
-						title: "2015 (4 mois) - Stage Fin L3 MIASHS Informatique",
+						title: "2015 - Stage Fin L3 MIASHS Informatique",
 						location: "<a href='https://www.nxp.com/'>Freescale Semiconducteur</a>, Toulouse, France (31)",
 						exp1: "Création d'un Service Web de Traitement et de Publication Statistiques de Données de Tests ",
 						exp2: "Python [Django, Panda] / HTML / Js [D3.js, JQuery] / CSS",
@@ -175,7 +177,7 @@ i18next
 				training: {
 					title: "Formation",
                     phd: {
-						title: "2017-2021 (4 ans) - Doctorat en Informatique",
+						title: "2017-2021 - Doctorat en Informatique",
 						location: "<a href='https://www.univ-tlse3.fr/'>Université Toulouse 3 Paul Sabatier</a> / <a href='https://www.irit.fr/?lang=en'>IRIT</a>, Toulouse, France (31)",
 					},
 					ice: {
@@ -202,6 +204,7 @@ i18next
 					nothing: "Bientôt !"
 				},
 				teachings: {
+					univtoulouse2: " - Université Toulouse 2 Jean-Jaurés",
 					univtoulouse3: " - Université Toulouse 3 Paul Sabatier"
 				},
 				projects: {