Perfomance and SEO improvements

Change-Id: I0f817c2d6766b3e9a8cfc455a4012976db4dbfef
diff --git a/404.html b/404.html
index 7b73547..8228d3c 100644
--- a/404.html
+++ b/404.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="no-js">
+<html lang="en" class="no-js">
     <head>
     	<!-- Google Tag Manager -->
 		<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
@@ -38,15 +38,6 @@
         
         <!-- Cookie content -->
         <link rel="stylesheet" type="text/css" href="//www.eclipse.org/eclipse.org-common/themes/solstice/public/stylesheets/vendor/cookieconsent/cookieconsent.min.css" />
-        <script src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
-        
-        <!-- Eclipse Foundation Google Tag Manager -->
-		<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
-		new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
-		j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
-		'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-		})(window,document,'script','dataLayer','GTM-5WLCZXC');</script>
-		<!-- End Google Tag Manager -->
         
         <!-- Template Javascript Files
         ================================================== -->
@@ -54,18 +45,8 @@
 		<base href="/capella/">
 		<script src="js/angular-1.7.8.min.js"></script>
 		<script src="angular/capella.js"></script>
-
-        <!-- modernizr js -->
-        <script src="js/vendor/modernizr-2.6.2.min.js"></script>
         <!-- jquery -->
         <script src="js/jquery-3.4.1.min.js"></script>
-        <!-- bootstrap js -->
-        <script src="js/bootstrap.min.js"></script>
-        <!-- wow js -->
-        <script src="js/wow.min.js"></script>
-        <!-- template main js -->
-        <script src="js/main.js"></script>
-      
     </head>
     <body ng-app="capella" data-deferred-cloak>
     	<!-- Google Tag Manager (noscript) -->
@@ -105,5 +86,24 @@
         Footer Section
         ================================================== -->
         <ng-include src="'angular/blocks/footer.html'"></ng-include>
+        
+         <!-- bootstrap js -->
+        <script defer src="js/bootstrap.min.js"></script>
+        <!-- wow js -->
+        <script defer src="js/wow.min.js"></script>
+        <script defer src="js/jquery.fancybox.js"></script>
+        <!-- template main js -->
+        <script defer src="js/main.js"></script>
+        <!-- Global site tag (gtag.js) - Google Analytics -->
+		<script async src="https://www.googletagmanager.com/gtag/js?id=UA-57722280-1"></script>
+		<script async src="js/googleAnalytics.js"></script>
+        <!-- Eclipse Foundation Google Tag Manager -->		
+        <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+        new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+        j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+        'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+        })(window,document,'script','dataLayer','GTM-5WLCZXC');</script>
+        <!-- End Google Tag Manager -->
+       <script src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
     </body>
 </html>
\ No newline at end of file
diff --git a/academic_material.html b/academic_material.html
index ceab609..fe5ef3c 100644
--- a/academic_material.html
+++ b/academic_material.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="no-js">
+<html lang="en" class="no-js">
     <head>
     	<!-- Google Tag Manager -->
 		<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
@@ -35,36 +35,26 @@
         <link rel="stylesheet" href="css/responsive.css">
 		<link rel="stylesheet" href="css/latofonts.css">
 
-        <script src="https://use.fontawesome.com/b51f77a16a.js"></script>
-
         <!-- Cookie content -->
         <link rel="stylesheet" type="text/css" href="//www.eclipse.org/eclipse.org-common/themes/solstice/public/stylesheets/vendor/cookieconsent/cookieconsent.min.css" />
-        <script src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
-
-        <!-- Eclipse Foundation Google Tag Manager -->
-		<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
-		new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
-		j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
-		'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-		})(window,document,'script','dataLayer','GTM-5WLCZXC');</script>
-		<!-- End Google Tag Manager -->
-
+    	<!-- Eclipse Foundation Google Tag Manager -->		
+        <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+        new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+        j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+        'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+        })(window,document,'script','dataLayer','GTM-5WLCZXC');</script>
+        <!-- End Google Tag Manager -->
+      
         <!-- Template Javascript Files
         ================================================== -->
 		<!-- Angular -->
 		<base href="/capella/">
 		<script src="js/angular-1.7.8.min.js"></script>
 		<script src="angular/capella.js"></script>
-        <!-- modernizr js -->
-        <script src="js/vendor/modernizr-2.6.2.min.js"></script>
+        
         <!-- jquery -->
         <script src="js/jquery-3.4.1.min.js"></script>
-        <!-- bootstrap js -->
-        <script src="js/bootstrap.min.js"></script>
-        <!-- wow js -->
-        <script src="js/wow.min.js"></script>
-        <!-- template main js -->
-        <script src="js/main.js"></script>
+		<script defer src="https://kit.fontawesome.com/16cf99803e.js" crossorigin="anonymous"></script>    
     </head>
     <body ng-app="capella" data-deferred-cloak>
     	<!-- Google Tag Manager (noscript) -->
@@ -138,7 +128,7 @@
 				<h2 class="title wow fadeInDown text-center" data-wow-delay=".1s">Resources</h2>
                 <div class="row">
                 	<div class="col-sm-4 col-xs-12 wow fadeInLeft animated" data-wow-duration="500ms" data-wow-delay="0ms">
-                        	 <p><img src="images/icons/icon_slideshows.png" alt="" ></p>
+                        	 <p><img src="images/icons/icon_slideshows.png" alt="Capella - Course esamples" class="lazyload" width="131" height="131"></p>
                             <div>
                                 <h4>Course examples</h4>
                                 <p><a href="https://download.polarsys.org/capella/publis/An_Introduction_to_Arcadia_20150115.pdf" target="_blank">Introduction to Arcadia (by Thales) <i class="fa fa-arrow-circle-right" aria-hidden="true"></i></a></p>
@@ -147,7 +137,7 @@
                             </div>
                     </div>
                     <div class="col-sm-4 col-xs-12 wow fadeInLeft animated" data-wow-duration="500ms" data-wow-delay="100ms">
-                            <p><img src="images/icons/icon_sample_models.png" alt="" ></p>
+                            <p><img src="images/icons/icon_sample_models.png" alt="Capella - Sample models" class="lazyload" width="131" height="131"></p>
                            <div>
                                 <h4>Sample models</h4>
                                 <p><a href="https://wiki.eclipse.org/Capella/Samples/IFE" target="_blank">In-Flight Entertainment <i class="fa fa-arrow-circle-right" aria-hidden="true"></i></a></p>
@@ -155,7 +145,7 @@
                             </div>
                     </div>
                     <div class="col-sm-4 col-xs-12 wow fadeInLeft animated" data-wow-duration="500ms" data-wow-delay="200ms">
-                            <p><img src="images/icons/icon_getting_started.png" alt="" ></p>
+                            <p><img src="images/icons/icon_getting_started.png" alt="Capella - Guides" class="lazyload" width="131" height="131"></p>
                             <div>
                                 <h4>Guides</h4>
                                 <p><a href="https://github.com/eclipse/capella/blob/master/doc/plugins/org.polarsys.capella.ui.doc/html/Installation Guide/How to install Capella and Addons.mediawiki#table-of-contents" target="_blank">Capella installation <i class="fa fa-arrow-circle-right" aria-hidden="true"></i></a></p>
@@ -177,8 +167,34 @@
         ==================================================
         Books
         ================================================== -->
-		<ng-include src="'angular/blocks/books.html'"></ng-include>
-
+<section id="books" class="text-center">
+			<div class="container">
+				<div class="section-heading">
+					<h2 class="title wow fadeInDown" data-wow-delay=".3s">Books</h2>
+					<p>Two books thoroughly describe respectively the method and the tool.<br>
+					The Arcadia book describes and illustrates the fundamentals of the method and its contribution to engineering activities.<br>
+					The Capella book is a practical guide to using the workbench. </p>
+				</div>
+				<div class="row">
+					<div class="col-sm-4 col-sm-offset-2 col-xs-12 wow fadeInLeft" data-wow-duration="500ms" data-wow-delay="0ms">
+						<p><a href="https://www.elsevier.com/books/model-based-system-and-architecture-engineering-with-the-arcadia-method/voirin/978-1-78548-169-7" target="_blank"><img src="images/thumbs/thumb_book_jlvoirin.png" alt="Model-based System<br>and Architecture Engineering with the Arcadia Method" class="lazyload" width="311" height="350"></a></p>
+						<div>
+							<h6 class="text-uppercase txt_lightest_grey txt_weight_300">Jean-Luc Voirin</h6>
+							<h4>Model-based System<br>and Architecture Engineering<br>with the Arcadia Method</h4>
+							<p><a class="btn btn-default wow fadeInUp" data-wow-delay=".6s" href="https://www.elsevier.com/books/model-based-system-and-architecture-engineering-with-the-arcadia-method/voirin/978-1-78548-169-7">Read More</a></p>
+						</div>
+					</div>
+					<div class="col-sm-4 col-xs-12 wow fadeInLeft" data-wow-duration="500ms" data-wow-delay="300ms">
+					   <p><a href="https://www.elsevier.com/books/systems-architecture-modeling-with-the-arcadia-method/roques/978-1-78548-168-0" target="_blank"><img src="images/thumbs/thumb_book_proques.png" alt="Systems Architecture Modeling with the Arcadia Method - A Practical Guide to Capella Modeling Tool" class="lazyload" width="311" height="350"></a></p>
+					   <div>
+							<h6 class="text-uppercase txt_lightest_grey txt_weight_300">Pascal Roques</h6>
+							<h4>Systems Architecture Modeling with the Arcadia Method - A Practical Guide to Capella Modeling Tool</h4>
+							<p><a class="btn btn-default wow fadeInUp" data-wow-delay=".6s" href="https://www.elsevier.com/books/systems-architecture-modeling-with-the-arcadia-method/roques/978-1-78548-168-0">Read More</a></p>
+					   </div>
+					</div>
+				</div>
+			</div>
+		</section>
 	<!-- #books -->
 
 
@@ -221,6 +237,20 @@
         Footer Section
         ================================================== -->
         <ng-include src="'angular/blocks/footer.html'"></ng-include>
-        <script async src="js/googleAnalytics.js" ></script>
+        
+        <!-- bootstrap js -->
+        <script defer src="js/bootstrap.min.js"></script>
+        <!-- wow js -->
+        <script defer src="js/wow.min.js"></script>
+        <script defer src="js/jquery.fancybox.js"></script>
+        <!-- template main js -->
+        <script defer src="js/main.js"></script>
+        <!-- Global site tag (gtag.js) - Google Analytics -->
+		<script async src="https://www.googletagmanager.com/gtag/js?id=UA-57722280-1"></script>
+		<script async src="js/googleAnalytics.js"></script>
+       
+        <script async src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
+        <!-- modernizr js -->
+        <script defer src="js/vendor/modernizr-2.6.2.min.js"></script>
     </body>
 </html>
\ No newline at end of file
diff --git a/addons.html b/addons.html
index 928d2c6..1dec340 100644
--- a/addons.html
+++ b/addons.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>

-<html class="no-js">

+<html lang="en" class="no-js">

 <head>

 		<!-- Google Tag Manager -->

 		<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':

@@ -33,21 +33,16 @@
 <!-- responsive css -->

 <link rel="stylesheet" href="css/responsive.css">

 <link rel="stylesheet" href="css/latofonts.css">

-

-<script src="https://use.fontawesome.com/b51f77a16a.js"></script>

-

 <!-- Cookie content -->

 <link rel="stylesheet" type="text/css" href="//www.eclipse.org/eclipse.org-common/themes/solstice/public/stylesheets/vendor/cookieconsent/cookieconsent.min.css" />

-<script async src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>

-

-<!-- Eclipse Foundation Google Tag Manager -->

-<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':

-new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],

-j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=

-'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);

-})(window,document,'script','dataLayer','GTM-5WLCZXC');</script>

-<!-- End Google Tag Manager -->

-

+  <!-- Eclipse Foundation Google Tag Manager -->		

+        <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':

+        new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],

+        j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=

+        'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);

+        })(window,document,'script','dataLayer','GTM-5WLCZXC');</script>

+        <!-- End Google Tag Manager -->

+        

 <!-- Template Javascript Files

         ================================================== -->

 <!-- Angular -->

@@ -55,18 +50,10 @@
 <script src="js/angular-1.7.8.min.js"></script>

 <script src="angular/capella.js"></script>

 

-<!-- modernizr js -->

-<script src="js/vendor/modernizr-2.6.2.min.js"></script>

 <!-- jquery -->

 <script src="js/jquery-3.4.1.min.js"></script>

 <script src="js/popper-1.14.3.min.js"></script>

-<!-- bootstrap js -->

-<script src="js/bootstrap.min.js"></script>

-<!-- wow js -->

-<script src="js/wow.min.js"></script>

-<!-- template main js -->

-<script async src="js/main.js"></script>

-

+<script defer src="https://kit.fontawesome.com/16cf99803e.js" crossorigin="anonymous"></script>

 </head>

 <body ng-app="capella" data-deferred-cloak>

 	<!-- Google Tag Manager (noscript) -->

@@ -111,7 +98,7 @@
 				<div class="container">

 				

 					<div class="row">

-						<p><i>To install Capella extensions have a look to the <a href="https://github.com/eclipse/capella/blob/master/doc/plugins/org.polarsys.capella.ui.doc/html/Installation%20Guide/How%20to%20install%20Capella%20and%20Addons.mediawiki#Configuration_and_Extensibility" target="_blank">installation procedure</a></i></p>

+						<p><i>To install Capella extensions have a look to the <a href="https://github.com/eclipse/capella/blob/master/doc/plugins/org.polarsys.capella.ui.doc/html/Installation%20Guide/How%20to%20install%20Capella%20and%20Addons.mediawiki#Configuration_and_Extensibility">installation procedure</a></i></p>

 					</div>

 					

 					<div class="row">

@@ -138,7 +125,7 @@
 					

 					<div class="row">

 						<p class="underline"><b><u>Compatibility and integration</u></b></p>

-						<p><i>Each author is responsible for the compatibility of his add-ons with different versions of Capella. See the Add-ons <a href="https://wiki.eclipse.org/Capella/Roadmap#Add-ons" target="_blank">releases and compatibility matrix</a></i>

+						<p><i>Each author is responsible for the compatibility of his add-ons with different versions of Capella. See the Add-ons <a href="https://wiki.eclipse.org/Capella/Roadmap#Add-ons">releases and compatibility matrix</a></i>

 						<br><i>Additional integration may be needed between two add-ons provided by different authors.</i></p>

 					</div>

 					

@@ -259,15 +246,24 @@
         ==================================================

         Call To Action Section Start

         ================================================== -->

-        		<ng-include src="'angular/blocks/call2action_services.html'"></ng-include>

-

-

+        <ng-include src="'angular/blocks/call2action_services.html'"></ng-include>

 

 	<!--

         ==================================================

         Footer Section

         ================================================== -->

 	<ng-include src="'angular/blocks/footer.html'"></ng-include>

-	<script async src="js/googleAnalytics.js" ></script>

+		<!-- bootstrap js -->

+        <script defer src="js/bootstrap.min.js"></script>

+        <!-- wow js -->

+        <script defer src="js/wow.min.js"></script>

+        <script defer src="js/jquery.fancybox.js"></script>

+        <!-- template main js -->

+        <script defer src="js/main.js"></script>

+        <!-- Global site tag (gtag.js) - Google Analytics -->

+		<script async src="https://www.googletagmanager.com/gtag/js?id=UA-57722280-1"></script>

+		<script async src="js/googleAnalytics.js"></script>

+       

+		<script async src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>

 </body>

 </html>
\ No newline at end of file
diff --git a/adopters.html b/adopters.html
index f75957e..6bc6443 100644
--- a/adopters.html
+++ b/adopters.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="no-js">
+<html lang="en" class="no-js">
 <head>
 		<!-- Google Tag Manager -->
 		<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
@@ -33,22 +33,15 @@
 <!-- responsive css -->
 <link rel="stylesheet" href="css/responsive.css">
 <link rel="stylesheet" href="css/latofonts.css">
-
-<script src="https://use.fontawesome.com/b51f77a16a.js"></script>
-
 <!-- Cookie content -->
 <link rel="stylesheet" type="text/css" href="//www.eclipse.org/eclipse.org-common/themes/solstice/public/stylesheets/vendor/cookieconsent/cookieconsent.min.css" />
-<script async src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
-
-<!-- Eclipse Foundation Google Tag Manager -->
-<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
-new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
-j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
-'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-})(window,document,'script','dataLayer','GTM-5WLCZXC');</script>
-<!-- End Google Tag Manager -->
-
-
+<!-- Eclipse Foundation Google Tag Manager -->		
+        <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+        new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+        j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+        'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+        })(window,document,'script','dataLayer','GTM-5WLCZXC');</script>
+        <!-- End Google Tag Manager -->
 <!-- shuffle function -->
 <script>
 function shuffle(array) {
@@ -80,17 +73,9 @@
 <script src="js/angular-1.7.8.min.js"></script>
 <script src="angular/capella.js"></script>
 
-<!-- modernizr js -->
-<script src="js/vendor/modernizr-2.6.2.min.js"></script>
 <!-- jquery -->
 <script src="js/jquery-3.4.1.min.js"></script>
-<!-- bootstrap js -->
-<script src="js/bootstrap.min.js"></script>
-<!-- wow js -->
-<script src="js/wow.min.js"></script>
-<!-- template main js -->
-<script src="js/main.js"></script>
-
+<script defer src="https://kit.fontawesome.com/16cf99803e.js" crossorigin="anonymous"></script>
 </head>
 <body ng-app="capella" data-deferred-cloak>
 	<!-- Google Tag Manager (noscript) -->
@@ -137,12 +122,12 @@
 	        for (var i in adopters) {
 	        	var item = " ";
 
-				item ="<img src='" + adopters[i].logoSrc + "' alt='Capella Adopters - " + adopters[i].company +"' title='" + adopters[i].company + "' />";
+				item ="<img src='" + adopters[i].logoSrc + "' alt='Capella Adopters - " + adopters[i].company +"' title='" + adopters[i].company + "' width='280'/>";
 
 				link = adopters[i].link;
 
 				if (link!=null && link!="") {
-					items += "<li><a href='" + link + "' target='_blank'>" + item + "</a></li>";
+					items += "<li><a href='" + link + "'>" + item + "</a></li>";
 				}
 				else {
 					items += "<li>" + item + "</li>";
@@ -173,17 +158,28 @@
 		});
 	</script>
 
-	<!--
-        ==================================================
-        Call To Action Section Start
-        ================================================== -->
+	   <!--
+       ==================================================
+       Call To Action Section Start
+       ================================================== -->
 	<ng-include src="'angular/blocks/call2action_adopters.html'"></ng-include>
 
-	<!--
+		<!--
         ==================================================
         Footer Section
         ================================================== -->
 	<ng-include src="'angular/blocks/footer.html'"></ng-include>
-	<script async src="js/googleAnalytics.js" ></script>
-</body>
+		<!-- bootstrap js -->
+        <script defer src="js/bootstrap.min.js"></script>
+        <!-- wow js -->
+        <script defer src="js/wow.min.js"></script>
+        <script defer src="js/jquery.fancybox.js"></script>
+        <!-- template main js -->
+        <script defer src="js/main.js"></script>
+        <!-- Global site tag (gtag.js) - Google Analytics -->
+		<script async src="https://www.googletagmanager.com/gtag/js?id=UA-57722280-1"></script>
+		<script async src="js/googleAnalytics.js"></script>
+    
+       <script src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
+     </body>
 </html>
\ No newline at end of file
diff --git a/angular/blocks/books.html b/angular/blocks/books.html
deleted file mode 100644
index 3949fc2..0000000
--- a/angular/blocks/books.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<section id="books" class="text-center">

-	<div class="container">

-		<div class="section-heading">

-			<h2 class="title wow fadeInDown" data-wow-delay=".3s">Books</h2>

-			<p>Two books thoroughly describe respectively the method and the tool.<br>

-			The Arcadia book describes and illustrates the fundamentals of the method and its contribution to engineering activities.<br>

-			The Capella book is a practical guide to using the workbench. </p>

-		</div>

-		<div class="row">

-			<div class="col-sm-4 col-sm-offset-2 col-xs-12 wow fadeInLeft" data-wow-duration="500ms" data-wow-delay="0ms">

-				<p><a href="https://www.elsevier.com/books/model-based-system-and-architecture-engineering-with-the-arcadia-method/voirin/978-1-78548-169-7" target="_blank"><img src="images/thumbs/thumb_book_jlvoirin.png" alt="Model-based System<br>and Architecture Engineering with the Arcadia Method" class="lazyload"></a></p>

-				<div>

-					<h6 class="text-uppercase txt_lightest_grey txt_weight_300">Jean-Luc Voirin</h6>

-					<h4>Model-based System<br>and Architecture Engineering<br>with the Arcadia Method</h4>

-					<p><a class="btn btn-default wow fadeInUp" data-wow-delay=".6s" href="https://www.elsevier.com/books/model-based-system-and-architecture-engineering-with-the-arcadia-method/voirin/978-1-78548-169-7">Read More</a></p>

-				</div>

-			</div>

-			<div class="col-sm-4 col-xs-12 wow fadeInLeft" data-wow-duration="500ms" data-wow-delay="300ms">

-			   <p><a href="https://www.elsevier.com/books/systems-architecture-modeling-with-the-arcadia-method/roques/978-1-78548-168-0" target="_blank"><img src="images/thumbs/thumb_book_proques.png" alt="Systems Architecture Modeling with the Arcadia Method - A Practical Guide to Capella Modeling Tool" class="lazyload"></a></p>

-			   <div>

-					<h6 class="text-uppercase txt_lightest_grey txt_weight_300">Pascal Roques</h6>

-					<h4>Systems Architecture Modeling with the Arcadia Method - A Practical Guide to Capella Modeling Tool</h4>

-					<p><a class="btn btn-default wow fadeInUp" data-wow-delay=".6s" href="https://www.elsevier.com/books/systems-architecture-modeling-with-the-arcadia-method/roques/978-1-78548-168-0">Read More</a></p>

-			   </div>

-			</div>

-		</div>

-	</div>

-</section>
\ No newline at end of file
diff --git a/angular/blocks/footer.html b/angular/blocks/footer.html
index e18c8ae..ae83c37 100644
--- a/angular/blocks/footer.html
+++ b/angular/blocks/footer.html
@@ -5,28 +5,28 @@
      	<div class="col-sm-4 col-xs-12">
 	<ul>
 		<li><h4>Legal</h4></li>
-		<li><a href="https://www.eclipse.org/legal/privacy.php" target="_blank">Privacy Policy</a></li>
-		<li><a href="https://www.eclipse.org/legal/termsofuse.php" target="_blank">Terms of Use</a></li>
-		<li><a href="https://www.eclipse.org/legal/copyright.php" target="_blank">Copyright Agent</a></li>
-		<li><a href="https://www.eclipse.org/legal/epl-2.0" target="_blank">Eclipse Public License</a></li>
-		<li><a href="https://www.eclipse.org/legal/" target="_blank">Legal Resources</a></li>
+		<li><a href="https://www.eclipse.org/legal/privacy.php" rel="noopener" target="_blank">Privacy Policy</a></li>
+		<li><a href="https://www.eclipse.org/legal/termsofuse.php" rel="noopener" target="_blank">Terms of Use</a></li>
+		<li><a href="https://www.eclipse.org/legal/copyright.php" rel="noopener" target="_blank">Copyright Agent</a></li>
+		<li><a href="https://www.eclipse.org/legal/epl-2.0" rel="noopener" target="_blank">Eclipse Public License</a></li>
+		<li><a href="https://www.eclipse.org/legal/" rel="noopener" target="_blank">Legal Resources</a></li>
 	</ul>
 </div>
      	<div class="col-sm-4 col-xs-12">
      		<ul>
 		<li><h4>Useful Links</h4></li>
-		<li><a href="https://projects.eclipse.org/projects/polarsys.capella" target="_blank">Project Page</a></li>
-		<li><a href="https://forum.mbse-capella.org/" target="_blank">Forum</a></li>
-		<li><a href="https://github.com/eclipse/capella/wiki/Repositories" target="_blank">Report a Bug</a></li>
-		<li><a href="https://github.com/eclipse/capella" target="_blank">Source Code <i class="fa fa-github" aria-hidden="true"></i></a></li>
-		<li><a href="https://github.com/eclipse/capella/wiki#factory-capella-development" target="_blank">How to Contribute</a></li>
+		<li><a href="https://projects.eclipse.org/projects/polarsys.capella" rel="noopener" target="_blank">Project Page</a></li>
+		<li><a href="https://forum.mbse-capella.org/" rel="noopener" target="_blank">Forum</a></li>
+		<li><a href="https://github.com/eclipse/capella/wiki/Repositories" rel="noopener" target="_blank">Report a Bug</a></li>
+		<li><a href="https://github.com/eclipse/capella" rel="noopener" target="_blank">Source Code <i class="fa fa-github" aria-hidden="true"></i></a></li>
+		<li><a href="https://github.com/eclipse/capella/wiki#factory-capella-development" rel="noopener" target="_blank">How to Contribute</a></li>
 	</ul>
 </div>
      	<div class="col-sm-4 col-xs-12">
 	<ul class="endfooter">
 		<li><h4>Other</h4></li>
-		<li><a href="https://www.eclipse.org/" target="_blank">Eclipse</a></li>
-		<li><a href="https://www.eclipse.org/org/workinggroups/" target="_blank">Working Groups</a></li>
+		<li><a href="https://www.eclipse.org/" rel="noopener" target="_blank">Eclipse</a></li>
+		<li><a href="https://www.eclipse.org/org/workinggroups/" rel="noopener" target="_blank">Working Groups</a></li>
 	</ul>
 </div>
 <div class="clear"></div>
@@ -37,10 +37,10 @@
 	      <div id="socialmedia" class="col-md-12">
 	           <!-- Social Media -->
 	         <ul class="socialmedia_links">
-	         	<li class="twitter"><a href="https://twitter.com/capella_arcadia " target="_blank"><i class="fa fa-twitter"></i> <span class="sr-only">Twitter</span></a></li>
-				<li class="youtube"><a href="https://www.youtube.com/EclipseCapella " target="_blank"><i class="fa fa-youtube"></i> <span class="sr-only">Youtube</span></a></li>
-				<li class="linkedin"><a href="https://www.linkedin.com/in/capella-mbse-tool-244083162/" target="_blank"><i class="fa fa-linkedin"></i> <span class="sr-only">Linkedin</span></a></li>
-	        	 <li class="wikipedia"><a href="https://en.wikipedia.org/wiki/Capella_(engineering)" target="_blank"><i class="fa fa-wikipedia-w"></i> <span class="sr-only">Wikipedia</span></a></li>
+	         	<li class="twitter"><a href="https://twitter.com/capella_arcadia " rel="noopener" target="_blank"><i class="fa fa-twitter"></i> <span class="sr-only">Twitter</span></a></li>
+				<li class="youtube"><a href="https://www.youtube.com/EclipseCapella " rel="noopener" target="_blank"><i class="fa fa-youtube"></i> <span class="sr-only">Youtube</span></a></li>
+				<li class="linkedin"><a href="https://www.linkedin.com/in/capella-mbse-tool-244083162/" rel="noopener" target="_blank"><i class="fa fa-linkedin"></i> <span class="sr-only">Linkedin</span></a></li>
+	        	 <li class="wikipedia"><a href="https://en.wikipedia.org/wiki/Capella_(engineering)" rel="noopener" target="_blank"><i class="fa fa-wikipedia-w"></i> <span class="sr-only">Wikipedia</span></a></li>
 	         </ul>
 	     </div>
 	</div>
diff --git a/angular/blocks/header.html b/angular/blocks/header.html
index 2c526d3..5b62b4d 100644
--- a/angular/blocks/header.html
+++ b/angular/blocks/header.html
@@ -17,7 +17,7 @@
                     <!-- logo -->

                     <div class="navbar-brand">

                         <a href="/capella" >

-                            <img src="images/logo_capella_big.png" alt="">

+                            <img src="images/logo_capella_big.png" alt="Logo Capella" width="180" height="74">

                         </a>

                     </div>

                     <!-- /logo -->

diff --git a/arcadia.html b/arcadia.html
index 8699d97..8de45c3 100644
--- a/arcadia.html
+++ b/arcadia.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="no-js">
+<html lang="en" class="no-js">
 <head>
 <!-- Google Tag Manager -->
 		<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
@@ -33,36 +33,28 @@
 <!-- responsive css -->
 <link rel="stylesheet" href="css/responsive.css">
 <link rel="stylesheet" href="css/latofonts.css">
-<script src="https://use.fontawesome.com/b51f77a16a.js"></script>
 <!-- Cookie content -->
 <link rel="stylesheet" type="text/css"
 	href="//www.eclipse.org/eclipse.org-common/themes/solstice/public/stylesheets/vendor/cookieconsent/cookieconsent.min.css" />
-<script
-	src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
-<!-- Eclipse Foundation Google Tag Manager -->
-<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
-		new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
-		j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
-		'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-		})(window,document,'script','dataLayer','GTM-5WLCZXC');</script>
-<!-- End Google Tag Manager -->
+<!-- Eclipse Foundation Google Tag Manager -->		
+        <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+        new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+        j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+        'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+        })(window,document,'script','dataLayer','GTM-5WLCZXC');</script>
+        <!-- End Google Tag Manager -->
+
 <!-- Template Javascript Files
         ================================================== -->
 <!-- Angular -->
 <base href="/capella/">
 <script src="js/angular-1.7.8.min.js"></script>
 <script src="angular/capella.js"></script>
-<!-- modernizr js -->
-<script src="js/vendor/modernizr-2.6.2.min.js"></script>
+
 <!-- jquery -->
 <script src="js/jquery-3.4.1.min.js"></script>
-<!-- bootstrap js -->
-<script src="js/bootstrap.min.js"></script>
-<!-- wow js -->
-<script src="js/wow.min.js"></script>
-<script src="js/jquery.fancybox.js"></script>
-<!-- template main js -->
-<script src="js/main.js"></script>
+<script src="js/lazysizes.min.js" async></script>        
+<script defer src="https://kit.fontawesome.com/16cf99803e.js" crossorigin="anonymous"></script>
 <!-- display videos in fancybox -->
 <script type="text/javascript">
             $(document).ready(function() {
@@ -154,10 +146,10 @@
 						management, product line, system supervision, and integration,
 						verification and validation (IVV). It provides a reference for the
 						modeling language defined by Arcadia.</p>
-					<p><a class="btn btn-default wow fadeInUp" data-wow-delay=".2s" href="https://www.elsevier.com/books/model-based-system-and-architecture-engineering-with-the-arcadia-method/voirin/978-1-78548-169-7" target="_blank">Read More</a></p>
+					<p><a class="btn btn-default wow fadeInUp" data-wow-delay=".2s" href="https://www.elsevier.com/books/model-based-system-and-architecture-engineering-with-the-arcadia-method/voirin/978-1-78548-169-7">Discover more about this book</a></p>
 				</div>
 				<div class="col-md-3 wow fadeInLeft" data-wow-delay=".2s">
-					<a href="https://www.elsevier.com/books/model-based-system-and-architecture-engineering-with-the-arcadia-method/voirin/978-1-78548-169-7" target="_blank"><img src="images/thumbs/thumb_book_jlvoirin.png"></a>
+					<a href="https://www.elsevier.com/books/model-based-system-and-architecture-engineering-with-the-arcadia-method/voirin/978-1-78548-169-7"><img class="lazyload" width="351" height="390" data-src="images/thumbs/thumb_book_jlvoirin.png" alt="Model-based System and Architecture Engineering with the Arcadia Method"></a>
 				</div>
 			</div>
 		</div>
@@ -288,9 +280,9 @@
 						definition drivers.</li>
 				</ul>
 				<p class="text-center"><a rel="gallery" class="fancybox"
-					href="images/arcadia/architecture_benefits.png"><img
+					href="images/arcadia/architecture_benefits.png"><img class="lazyload" width="600" height="379"
 					alt="Architecture benefits"
-					src="images/arcadia/architecture_benefits.png" width="50%"></a></p><br>
+					data-src="images/arcadia/architecture_benefits.png"></a></p><br>
 				<br>
 				<div id="arcadia-mbse-method"></div>
 				<h3>Arcadia, a model-based engineering method</h3>
@@ -300,14 +292,14 @@
 						hardware and software architectural design</b>. It has been developed
 					by Thales between 2005 and 2010 through an iterative process
 					involving operational architects from all the Thales business
-					domains. Since 2018, Arcadia is registered as <a href="https://norminfo.afnor.org/norme/XP%20Z67-140/technologies-de-linformation-arcadia-methode-pour-lingenierie-des-systemes-soutenue-par-son-langage-de-modelisation/123795" target = "_blank">Z67-140 standard</a> by AFNOR, the French national organization for standardization.
+					domains. Since 2018, Arcadia is registered as <a href="https://norminfo.afnor.org/norme/XP%20Z67-140/technologies-de-linformation-arcadia-methode-pour-lingenierie-des-systemes-soutenue-par-son-langage-de-modelisation/123795">Z67-140 standard</a> by AFNOR, the French national organization for standardization.
 				</p>
 				<p>Arcadia promotes a viewpoint-driven approach (as described in
-					<a href="http://www.iso-architecture.org/42010" target="_blank">ISO/IEC 42010</a>) and emphasizes a clear distinction between need and
+					<a href="http://www.iso-architecture.org/42010">ISO/IEC 42010</a>) and emphasizes a clear distinction between need and
 					solution.</p>
 				<p class="text-center"><a rel="gallery" class="fancybox"
-					href="images/arcadia/triptique.png"><img
-					alt="Triptique" src="images/arcadia/triptique.png" width="50%"></a></p>
+					href="images/arcadia/triptique.png"><img class="lazyload" width="600" height="auto"
+					alt="Triptique" data-src="images/arcadia/triptique.png"></a></p>
 				<br> <br>
 				<p>Perspectives and activities of the method have been defined in order to comply with a
 					few Golden Rules:</p>
@@ -343,8 +335,8 @@
 					</li>
 				</ul>
 				<p class="text-center"><a rel="gallery" class="fancybox"
-					href="images/arcadia/phases_arcadia.png"><img
-					alt="Phases" src="images/arcadia/phases_arcadia.png" width="50%"></a></p><br>
+					href="images/arcadia/phases_arcadia.png"><img class="lazyload" width="527" height="373"
+					alt="Phases" data-src="images/arcadia/phases_arcadia.png"></a></p><br>
 				<br>
 				<div id="arcadia-features"></div>
 				<h3>Noticeable features of Arcadia</h3>
@@ -422,7 +414,7 @@
 				<p>Watch the video below, illustrating this architecture level with a commented example: the level-crossing traffic control.</p>
 				<div class="row">
 	                <div class="col-md-12 text-center">
-						<p><a class="fancybox" href="https://www.youtube.com/embed/TawT_G9DNNc" data-fancybox-type="iframe"><img src="images/arcadia/mockups/arcadia-customer-operational-need-analysis.png" alt="" /></a></p>
+						<p><a class="fancybox" href="https://www.youtube.com/embed/TawT_G9DNNc" data-fancybox-type="iframe"><img class="lazyload" width="600" height="auto" data-src="images/arcadia/mockups/arcadia-customer-operational-need-analysis.png" alt="Arcadia - Customer Operational Need Analysis" /></a></p>
 					</div>
                 </div>
 				<div id="arcadia-system-need-analysis"></div>
@@ -457,7 +449,7 @@
 				<p>Watch the video below, illustrating this architecture level with a commented example: the level-crossing traffic control.</p>
 				<div class="row">
 	                <div class="col-md-12 text-center">
-						<p><a class="fancybox" href="https://www.youtube.com/embed/UESXFZFbi5Q" data-fancybox-type="iframe"><img src="images/arcadia/mockups/arcadia-system-need-analysis.png" alt="" /></a></p>
+						<p><a class="fancybox" href="https://www.youtube.com/embed/UESXFZFbi5Q" data-fancybox-type="iframe"><img class="lazyload" width="600" height="auto" data-src="images/arcadia/mockups/arcadia-system-need-analysis.png" alt="Arcadia - Formalization of system requirements - System Need Analysis" /></a></p>
 					</div>
                 </div>
 				<div id="arcadia-logical-architecture"></div>
@@ -480,9 +472,9 @@
 					these items)
 				</p>
 				<p class="text-center"><a rel="gallery" class="fancybox"
-					href="images/arcadia/composant-functions.png"><img
+					href="images/arcadia/composant-functions.png"><img class="lazyload" width="600" height="auto"
 					alt="Functions"
-					src="images/arcadia/composant-functions.png" width="50%"></a></p> <br>
+					data-src="images/arcadia/composant-functions.png"></a></p> <br>
 				<br>
 				<p>
 					The building process has to take into account <b>architectural
@@ -504,13 +496,13 @@
 					analysis, links with requirements and operational scenarios are
 					also to be produced.</p>
 				<p class="text-center"><a rel="gallery" class="fancybox"
-					href="images/arcadia/arcadia_viewpoints.png"><img
+					href="images/arcadia/arcadia_viewpoints.png"><img class="lazyload" width="600" height="auto"
 					alt="Viewpoints"
-					src="images/arcadia/arcadia_viewpoints.png" width="50%"></a></p><br>
+					data-src="images/arcadia/arcadia_viewpoints.png"></a></p><br>
 				<p>Watch the video below, illustrating this architecture level with a commented example: the level-crossing traffic control.</p>
 				<div class="row">
 	                <div class="col-md-12 text-center">
-						<p><a class="fancybox" href="https://www.youtube.com/embed/4jSoVNb4gaQ" data-fancybox-type="iframe"><img src="images/arcadia/mockups/arcadia-logical-architecture.png" alt="" /></a></p>
+						<p><a class="fancybox" href="https://www.youtube.com/embed/4jSoVNb4gaQ" data-fancybox-type="iframe"><img class="lazyload" width="600" height="auto" data-src="images/arcadia/mockups/arcadia-logical-architecture.png" alt="Arcadia - Definition of solution architecture - Logical Architecture (Notional Solution)" /></a></p>
 					</div>
                 </div>
 				<br>
@@ -538,7 +530,7 @@
 				<p>Watch the video below, illustrating this architecture level with a commented example: the level-crossing traffic control.</p>
 				<div class="row">
 	                <div class="col-md-12 text-center">
-						<p><a class="fancybox" href="https://www.youtube.com/embed/1EEcDtLAiXk" data-fancybox-type="iframe"><img src="images/arcadia/mockups/arcadia-physical-architecture.png" alt="" /></a></p>
+						<p><a class="fancybox" href="https://www.youtube.com/embed/1EEcDtLAiXk" data-fancybox-type="iframe"><img class="lazyload" width="600" height="auto" data-src="images/arcadia/mockups/arcadia-physical-architecture.png" alt="Arcadia - Definition of solution architecture - Physical Architecture" /></a></p>
 					</div>
                 </div>
 				<div id="arcadia-components-requirements"></div>
@@ -564,10 +556,9 @@
 						between systems, software, and hardware stakeholders</b>.
 				</p>
 				<p class="text-center"><a rel="gallery" class="fancybox"
-					href="images/arcadia/coengineering-and-subcontracting.png"><img
+					href="images/arcadia/coengineering-and-subcontracting.png"><img class="lazyload" width="600" height="auto"
 					alt="Coengineering"
-					src="images/arcadia/coengineering-and-subcontracting.png"
-					width="50%"></a></p><br> <br>
+					data-src="images/arcadia/coengineering-and-subcontracting.png"></a></p><br> <br>
 				<p>
 					Arcadia can be applied in a <b>recursive way at each level of
 						system breakdown</b>, so that a subsystem of the current system of
@@ -582,8 +573,8 @@
 					neighborhood, in order to define its IVVQ context while preserving
 					Intellectual Property constraints.</p>
 				<p class="text-center"><a rel="gallery" class="fancybox"
-					href="images/arcadia/multi-level.png"><img
-					alt="Multi-level" src="images/arcadia/multi-level.png" width="50%" /></a></p>
+					href="images/arcadia/multi-level.png"><img class="lazyload" width="600" height="auto"
+					alt="Multi-level" data-src="images/arcadia/multi-level.png" /></a></p>
 				<br> <br>
 				<div id="arcadia-adoptation"></div>
 				<h3>Adaptation of Arcadia to Dedicated Domains, Contexts, Etc.</h3>
@@ -684,6 +675,19 @@
         Footer Section
         ================================================== -->
 	<ng-include src="'angular/blocks/footer.html'"></ng-include>
-	<script async src="js/googleAnalytics.js"></script>
-</body>
+		
+		<!-- bootstrap js -->
+        <script defer src="js/bootstrap.min.js"></script>
+        <!-- wow js -->
+        <script defer src="js/wow.min.js"></script>
+        <script defer src="js/jquery.fancybox.js"></script>
+        <!-- template main js -->
+        <script defer src="js/main.js"></script>
+        <!-- Global site tag (gtag.js) - Google Analytics -->
+		<script async src="https://www.googletagmanager.com/gtag/js?id=UA-57722280-1"></script>
+		<script async src="js/googleAnalytics.js"></script>
+        
+        <script async src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
+        <!-- modernizr js -->
+        <script defer src="js/vendor/modernizr-2.6.2.min.js"></script></body>
 </html>
\ No newline at end of file
diff --git a/arcadia_capella_sysml_tool.html b/arcadia_capella_sysml_tool.html
index 183a135..f0d8e0b 100644
--- a/arcadia_capella_sysml_tool.html
+++ b/arcadia_capella_sysml_tool.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="no-js">
+<html lang="en" class="no-js">
 <head>
 <!-- Google Tag Manager -->
 		<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
@@ -41,26 +41,15 @@
 <!-- Cookie content -->
 <link rel="stylesheet" type="text/css"
 	href="//www.eclipse.org/eclipse.org-common/themes/solstice/public/stylesheets/vendor/cookieconsent/cookieconsent.min.css" />
-<script
-	src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
+       <!-- Eclipse Foundation Google Tag Manager -->		
+       <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+       new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+       j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+       'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+       })(window,document,'script','dataLayer','GTM-5WLCZXC');</script>
+       <!-- End Google Tag Manager -->
 
-<!-- Eclipse Foundation Google Tag Manager -->
-<script>
-	(function(w, d, s, l, i) {
-		w[l] = w[l] || [];
-		w[l].push({
-			'gtm.start' : new Date().getTime(),
-			event : 'gtm.js'
-		});
-		var f = d.getElementsByTagName(s)[0], j = d.createElement(s), dl = l != 'dataLayer' ? '&l='
-				+ l
-				: '';
-		j.async = true;
-		j.src = 'https://www.googletagmanager.com/gtm.js?id=' + i + dl;
-		f.parentNode.insertBefore(j, f);
-	})(window, document, 'script', 'dataLayer', 'GTM-5WLCZXC');
-</script>
-<!-- End Google Tag Manager -->
+
 
 <!-- Template Javascript Files
         ================================================== -->
@@ -69,18 +58,9 @@
 <script src="js/angular-1.7.8.min.js"></script>
 <script src="angular/capella.js"></script>
 
-<!-- modernizr js -->
-<script src="js/vendor/modernizr-2.6.2.min.js"></script>
 <!-- jquery -->
 <script src="js/jquery-3.4.1.min.js"></script>
-<!-- bootstrap js -->
-<script src="js/bootstrap.min.js"></script>
-<!-- wow js -->
-<script src="js/wow.min.js"></script>
-<script src="js/jquery.fancybox.js"></script>
-<!-- template main js -->
-<script src="js/main.js"></script>
-
+<script defer src="https://kit.fontawesome.com/16cf99803e.js" crossorigin="anonymous"></script>
 </head>
 <body ng-app="capella" data-deferred-cloak>
 	<!-- Google Tag Manager (noscript) -->
@@ -150,7 +130,7 @@
 				</h3><br>
                    
 	                <div class="col-md-12 text-center">
-						<p><a class="fancybox" href="https://www.youtube.com/embed/qFfj8K3uj3Y" data-fancybox-type="iframe"><img src="images/arcadia_sysml/webinar_sysml_arcadia_capella.png" alt="" /></a></p>
+						<p><a class="fancybox" href="https://www.youtube.com/embed/qFfj8K3uj3Y" data-fancybox-type="iframe"><img src="images/arcadia_sysml/webinar_sysml_arcadia_capella.png" alt="Webinar Sysml Arcadia Capella" /></a></p>
 					</div>
                 </div>
             </div>
@@ -1154,6 +1134,20 @@
         Footer Section
         ================================================== -->
 	<ng-include src="'angular/blocks/footer.html'"></ng-include>
-	<script async src="js/googleAnalytics.js"></script>
+
+	 <!-- bootstrap js -->
+        <script defer src="js/bootstrap.min.js"></script>
+        <!-- wow js -->
+        <script defer src="js/wow.min.js"></script>
+        <script defer src="js/jquery.fancybox.js"></script>
+        <!-- template main js -->
+        <script defer src="js/main.js"></script>
+        <!-- Global site tag (gtag.js) - Google Analytics -->
+		<script async src="https://www.googletagmanager.com/gtag/js?id=UA-57722280-1"></script>
+		<script async src="js/googleAnalytics.js"></script>
+		
+        <script async src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
+        <!-- modernizr js -->
+        <script defer src="js/vendor/modernizr-2.6.2.min.js"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/capella_day_munich_2019.html b/capella_day_munich_2019.html
index efa5b8b..a3c20ec 100644
--- a/capella_day_munich_2019.html
+++ b/capella_day_munich_2019.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="no-js">
+<html lang="en" class="no-js">
 <head>
 	<!-- Google Tag Manager -->
 		<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
@@ -36,14 +36,9 @@
 	<link rel="stylesheet" href="css/responsive.css">
 	<link rel="stylesheet" href="css/latofonts.css">
 
-	<script src="https://use.fontawesome.com/b51f77a16a.js"></script>
-
 	<!-- Cookie content -->
 	<link rel="stylesheet" type="text/css"
 		href="//www.eclipse.org/eclipse.org-common/themes/solstice/public/stylesheets/vendor/cookieconsent/cookieconsent.min.css" />
-	<script
-		src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
-
 	<!-- Eclipse Foundation Google Tag Manager -->
 	<script>
 		(function (w, d, s, l, i) {
@@ -69,18 +64,9 @@
 	<script src="js/angular-1.7.8.min.js"></script>
 	<script src="angular/capella.js"></script>
 
-	<!-- modernizr js -->
-	<script src="js/vendor/modernizr-2.6.2.min.js"></script>
 	<!-- jquery -->
 	<script src="js/jquery-3.4.1.min.js"></script>
-	<!-- bootstrap js -->
-	<script src="js/bootstrap.min.js"></script>
-	<!-- wow js -->
-	<script src="js/wow.min.js"></script>
-	<script src="js/jquery.fancybox.js"></script>
-	<!-- template main js -->
-	<script src="js/main.js"></script>
-
+	<script defer src="https://kit.fontawesome.com/16cf99803e.js" crossorigin="anonymous"></script>
 </head>
 
 <body ng-app="capella" data-deferred-cloak>
@@ -686,7 +672,21 @@
         Footer Section
         ================================================== -->
 	<ng-include src="'angular/blocks/footer.html'"></ng-include>
-	<script async src="js/googleAnalytics.js"></script>
+
+ <!-- bootstrap js -->
+        <script defer src="js/bootstrap.min.js"></script>
+        <!-- wow js -->
+        <script defer src="js/wow.min.js"></script>
+        <script defer src="js/jquery.fancybox.js"></script>
+        <!-- template main js -->
+        <script defer src="js/main.js"></script>
+        <!-- Global site tag (gtag.js) - Google Analytics -->
+		<script async src="https://www.googletagmanager.com/gtag/js?id=UA-57722280-1"></script>
+		<script async src="js/googleAnalytics.js"></script>
+        
+        <script async src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
+        <!-- modernizr js -->
+        <script defer src="js/vendor/modernizr-2.6.2.min.js"></script>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/capella_days.html b/capella_days.html
index 39eaed4..9c65e07 100644
--- a/capella_days.html
+++ b/capella_days.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="no-js">
+<html lang="en" class="no-js">
 <head>
 	<!-- Google Tag Manager -->
 		<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
@@ -34,12 +34,10 @@
 	<!-- responsive css -->
 	<link rel="stylesheet" href="css/responsive.css">
 	<link rel="stylesheet" href="css/latofonts.css">
-	<script src="https://use.fontawesome.com/b51f77a16a.js"></script>
+
 	<!-- Cookie content -->
 	<link rel="stylesheet" type="text/css"
 		href="//www.eclipse.org/eclipse.org-common/themes/solstice/public/stylesheets/vendor/cookieconsent/cookieconsent.min.css" />
-	<script
-		src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
 	<!-- Eclipse Foundation Google Tag Manager -->
 	<script>
 		(function (w, d, s, l, i) {
@@ -57,23 +55,17 @@
 		})(window, document, 'script', 'dataLayer', 'GTM-5WLCZXC');
 	</script>
 	<!-- End Google Tag Manager -->
+	
 	<!-- Template Javascript Files
         ================================================== -->
 	<!-- Angular -->
 	<base href="/capella/">
 	<script src="js/angular-1.7.8.min.js"></script>
 	<script src="angular/capella.js"></script>
-	<!-- modernizr js -->
-	<script src="js/vendor/modernizr-2.6.2.min.js"></script>
+	
 	<!-- jquery -->
 	<script src="js/jquery-3.4.1.min.js"></script>
-	<!-- bootstrap js -->
-	<script src="js/bootstrap.min.js"></script>
-	<!-- wow js -->
-	<script src="js/wow.min.js"></script>
-	<script src="js/jquery.fancybox.js"></script>
-	<!-- template main js -->
-	<script src="js/main.js"></script>
+	<script defer src="https://kit.fontawesome.com/16cf99803e.js" crossorigin="anonymous"></script>
 </head>
 <body ng-app="capella" data-deferred-cloak>
 	<!-- Google Tag Manager (noscript) -->
@@ -167,6 +159,20 @@
         Footer Section
         ================================================== -->
 	<ng-include src="'angular/blocks/footer.html'"></ng-include>
-	<script async src="js/googleAnalytics.js"></script>
+
+<!-- bootstrap js -->
+        <script defer src="js/bootstrap.min.js"></script>
+        <!-- wow js -->
+        <script defer src="js/wow.min.js"></script>
+        <script defer src="js/jquery.fancybox.js"></script>
+        <!-- template main js -->
+        <script defer src="js/main.js"></script>
+        <!-- Global site tag (gtag.js) - Google Analytics -->
+		<script async src="https://www.googletagmanager.com/gtag/js?id=UA-57722280-1"></script>
+		<script async src="js/googleAnalytics.js"></script>
+        
+        <script async src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
+        <!-- modernizr js -->
+        <script defer src="js/vendor/modernizr-2.6.2.min.js"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/capella_days_2020.html b/capella_days_2020.html
index 2499c4d..0179fb5 100644
--- a/capella_days_2020.html
+++ b/capella_days_2020.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="no-js">
+<html lang="en" class="no-js">
 <head>
 	<!-- Google Tag Manager -->
 		<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
@@ -34,12 +34,11 @@
 	<!-- responsive css -->
 	<link rel="stylesheet" href="css/responsive.css">
 	<link rel="stylesheet" href="css/latofonts.css">
-	<script src="https://kit.fontawesome.com/16cf99803e.js" crossorigin="anonymous"></script>
+
 	<!-- Cookie content -->
 	<link rel="stylesheet" type="text/css"
 		href="//www.eclipse.org/eclipse.org-common/themes/solstice/public/stylesheets/vendor/cookieconsent/cookieconsent.min.css" />
-	<script
-		src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
+	
 	<!-- Eclipse Foundation Google Tag Manager -->
 	<script>
 		(function (w, d, s, l, i) {
@@ -63,17 +62,10 @@
 	<base href="/capella/">
 	<script src="js/angular-1.7.8.min.js"></script>
 	<script src="angular/capella.js"></script>
-	<!-- modernizr js -->
-	<script src="js/vendor/modernizr-2.6.2.min.js"></script>
+	
 	<!-- jquery -->
 	<script src="js/jquery-3.4.1.min.js"></script>
-	<!-- bootstrap js -->
-	<script src="js/bootstrap.min.js"></script>
-	<!-- wow js -->
-	<script src="js/wow.min.js"></script>
-	<script src="js/jquery.fancybox.js"></script>
-	<!-- template main js -->
-	<script src="js/main.js"></script>
+	<script defer src="https://kit.fontawesome.com/16cf99803e.js" crossorigin="anonymous"></script>
 </head>
 <body ng-app="capella" data-deferred-cloak>
 	<!-- Google Tag Manager (noscript) -->
@@ -710,6 +702,20 @@
         Footer Section
         ================================================== -->
 	<ng-include src="'angular/blocks/footer.html'"></ng-include>
-	<script async src="js/googleAnalytics.js"></script>
-</body>
+
+ 		<!-- bootstrap js -->
+        <script defer src="js/bootstrap.min.js"></script>
+        <!-- wow js -->
+        <script defer src="js/wow.min.js"></script>
+        <script defer src="js/jquery.fancybox.js"></script>
+        <!-- template main js -->
+        <script defer src="js/main.js"></script>
+        <!-- Global site tag (gtag.js) - Google Analytics -->
+		<script async src="https://www.googletagmanager.com/gtag/js?id=UA-57722280-1"></script>
+		<script async src="js/googleAnalytics.js"></script>
+        
+        <script async src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
+        <!-- modernizr js -->
+        <script defer src="js/vendor/modernizr-2.6.2.min.js"></script>
+	</body>
 </html>
\ No newline at end of file
diff --git a/capella_days_2021.html b/capella_days_2021.html
index 8e45927..ec64a72 100644
--- a/capella_days_2021.html
+++ b/capella_days_2021.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="no-js">
+<html lang="en" class="no-js">
 <head>
 	<!-- Google Tag Manager -->
 		<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
@@ -34,46 +34,26 @@
 	<!-- responsive css -->
 	<link rel="stylesheet" href="css/responsive.css">
 	<link rel="stylesheet" href="css/latofonts.css">
-	<script src="https://kit.fontawesome.com/16cf99803e.js" crossorigin="anonymous"></script>
 	<!-- Cookie content -->
 	<link rel="stylesheet" type="text/css"
 		href="//www.eclipse.org/eclipse.org-common/themes/solstice/public/stylesheets/vendor/cookieconsent/cookieconsent.min.css" />
-	<script
-		src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
-	<!-- Eclipse Foundation Google Tag Manager -->
-	<script>
-		(function (w, d, s, l, i) {
-			w[l] = w[l] || [];
-			w[l].push({
-				'gtm.start': new Date().getTime(),
-				event: 'gtm.js'
-			});
-			var f = d.getElementsByTagName(s)[0], j = d.createElement(s), dl = l != 'dataLayer' ? '&l='
-				+ l
-				: '';
-			j.async = true;
-			j.src = 'https://www.googletagmanager.com/gtm.js?id=' + i + dl;
-			f.parentNode.insertBefore(j, f);
-		})(window, document, 'script', 'dataLayer', 'GTM-5WLCZXC');
-	</script>
-	<!-- End Google Tag Manager -->
+	<!-- Eclipse Foundation Google Tag Manager -->		
+        <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+        new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+        j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+        'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+        })(window,document,'script','dataLayer','GTM-5WLCZXC');</script>
+        <!-- End Google Tag Manager -->
+	
 	<!-- Template Javascript Files
         ================================================== -->
 	<!-- Angular -->
 	<base href="/capella/">
 	<script src="js/angular-1.7.8.min.js"></script>
 	<script src="angular/capella.js"></script>
-	<!-- modernizr js -->
-	<script src="js/vendor/modernizr-2.6.2.min.js"></script>
 	<!-- jquery -->
 	<script src="js/jquery-3.4.1.min.js"></script>
-	<!-- bootstrap js -->
-	<script src="js/bootstrap.min.js"></script>
-	<!-- wow js -->
-	<script src="js/wow.min.js"></script>
-	<script src="js/jquery.fancybox.js"></script>
-	<!-- template main js -->
-	<script src="js/main.js"></script>
+	<script defer src="https://kit.fontawesome.com/16cf99803e.js" crossorigin="anonymous"></script>
 </head>
 <body ng-app="capella" data-deferred-cloak>
 	<!-- Google Tag Manager (noscript) -->
@@ -589,6 +569,19 @@
         Footer Section
         ================================================== -->
 	<ng-include src="'angular/blocks/footer.html'"></ng-include>
-	<script async src="js/googleAnalytics.js"></script>
-</body>
+
+		<!-- bootstrap js -->
+        <script defer src="js/bootstrap.min.js"></script>
+        <!-- wow js -->
+        <script defer src="js/wow.min.js"></script>
+        <script defer src="js/jquery.fancybox.js"></script>
+        <!-- template main js -->
+        <script defer src="js/main.js"></script>
+        <!-- Global site tag (gtag.js) - Google Analytics -->
+		<script async src="https://www.googletagmanager.com/gtag/js?id=UA-57722280-1"></script>
+		<script async src="js/googleAnalytics.js"></script>
+       
+        <script async src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
+        <!-- modernizr js -->
+        <script defer src="js/vendor/modernizr-2.6.2.min.js"></script></body>
 </html>
\ No newline at end of file
diff --git a/community.html b/community.html
index d790e0d..c0cef5d 100644
--- a/community.html
+++ b/community.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="no-js">
+<html lang="en" class="no-js">
     <head>
     	<!-- Google Tag Manager -->
 		<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
@@ -36,12 +36,8 @@
         <link rel="stylesheet" href="css/responsive.css">
 		<link rel="stylesheet" href="css/latofonts.css">
 		
-        <script src="https://use.fontawesome.com/b51f77a16a.js"></script>
-
         <!-- Cookie content -->
         <link rel="stylesheet" type="text/css" href="//www.eclipse.org/eclipse.org-common/themes/solstice/public/stylesheets/vendor/cookieconsent/cookieconsent.min.css" />
-        <script src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
-
         <!-- Eclipse Foundation Google Tag Manager -->
 		<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
 		new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
@@ -56,16 +52,10 @@
 		<base href="/capella/">
 		<script src="js/angular-1.7.8.min.js"></script>
 		<script src="angular/capella.js"></script>
-        <!-- modernizr js -->
-        <script src="js/vendor/modernizr-2.6.2.min.js"></script>
+        
         <!-- jquery -->
         <script src="js/jquery-3.4.1.min.js"></script>
-        <!-- bootstrap js -->
-        <script src="js/bootstrap.min.js"></script>
-        <!-- wow js -->
-        <script src="js/wow.min.js"></script>
-        <!-- template main js -->
-        <script src="js/main.js"></script>
+        <script defer src="https://kit.fontawesome.com/16cf99803e.js" crossorigin="anonymous"></script>
     </head>
     <body ng-app="capella" data-deferred-cloak>
     	<!-- Google Tag Manager (noscript) -->
@@ -193,6 +183,20 @@
         Footer Section
         ================================================== -->
         <ng-include src="'angular/blocks/footer.html'"></ng-include>
-        <script async src="js/googleAnalytics.js" ></script>
+
+	<!-- bootstrap js -->
+        <script defer src="js/bootstrap.min.js"></script>
+        <!-- wow js -->
+        <script defer src="js/wow.min.js"></script>
+        <script defer src="js/jquery.fancybox.js"></script>
+        <!-- template main js -->
+        <script defer src="js/main.js"></script>
+        <!-- Global site tag (gtag.js) - Google Analytics -->
+		<script async src="https://www.googletagmanager.com/gtag/js?id=UA-57722280-1"></script>
+		<script async src="js/googleAnalytics.js"></script>
+        
+        <script async src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
+        <!-- modernizr js -->
+        <script defer src="js/vendor/modernizr-2.6.2.min.js"></script>
     </body>
 </html>
\ No newline at end of file
diff --git a/contact.html b/contact.html
index 539b0ec..5e30c1b 100644
--- a/contact.html
+++ b/contact.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="no-js">
+<html lang="en" class="no-js">
     <head>
     	<!-- Google Tag Manager -->
 		<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
@@ -34,13 +34,9 @@
         <!-- responsive css -->
         <link rel="stylesheet" href="css/responsive.css">
         <link rel="stylesheet" href="css/latofonts.css">
-
-        <script src="https://use.fontawesome.com/b51f77a16a.js"></script>
-
+        
         <!-- Cookie content -->
         <link rel="stylesheet" type="text/css" href="//www.eclipse.org/eclipse.org-common/themes/solstice/public/stylesheets/vendor/cookieconsent/cookieconsent.min.css" />
-        <script src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
-
         <!-- Eclipse Foundation Google Tag Manager -->
 		<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
 		new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
@@ -56,17 +52,9 @@
 		<script src="js/angular-1.7.8.min.js"></script>
 		<script src="angular/capella.js"></script>
 
-        <!-- modernizr js -->
-        <script src="js/vendor/modernizr-2.6.2.min.js"></script>
-        <!-- jquery -->
+       	<!-- jquery -->
         <script src="js/jquery-3.4.1.min.js"></script>
-        <!-- bootstrap js -->
-		 <script src="js/bootstrap.min.js"></script>
-        <!-- wow js -->
-        <script src="js/wow.min.js"></script>
-        <script src="js/jquery.fancybox.js"></script>
-        <!-- template main js -->
-        <script src="js/main.js"></script>
+       <script defer src="https://kit.fontawesome.com/16cf99803e.js" crossorigin="anonymous"></script>
     </head>
     <body ng-app="capella" data-deferred-cloak>
     	<!-- Google Tag Manager (noscript) -->
@@ -159,6 +147,20 @@
         Footer Section
         ================================================== -->
         <ng-include src="'angular/blocks/footer.html'"></ng-include>
-        <script async src="js/googleAnalytics.js" ></script>
+
+	 <!-- bootstrap js -->
+        <script defer src="js/bootstrap.min.js"></script>
+        <!-- wow js -->
+        <script defer src="js/wow.min.js"></script>
+        <script defer src="js/jquery.fancybox.js"></script>
+        <!-- template main js -->
+        <script defer src="js/main.js"></script>
+        <!-- Global site tag (gtag.js) - Google Analytics -->
+		<script async src="https://www.googletagmanager.com/gtag/js?id=UA-57722280-1"></script>
+		<script async src="js/googleAnalytics.js"></script>
+        
+        <script async src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
+        <!-- modernizr js -->
+        <script defer src="js/vendor/modernizr-2.6.2.min.js"></script>
     </body>
 </html>
\ No newline at end of file
diff --git a/download.html b/download.html
index bd63846..a6effe0 100644
--- a/download.html
+++ b/download.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="no-js">
+<html lang="en" class="no-js">
     <head>
     	<!-- Google Tag Manager -->
 		<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
@@ -33,22 +33,17 @@
         <link rel="stylesheet" href="css/main.css">
         <!-- responsive css -->
         <link rel="stylesheet" href="css/responsive.css">
-		<link rel="stylesheet" href="css/latofonts.css">
-		
-        <script src="https://use.fontawesome.com/b51f77a16a.js"></script>
-
+		<link rel="stylesheet" href="css/latofonts.css">		
         <!-- Cookie content -->
         <link rel="stylesheet" type="text/css" href="//www.eclipse.org/eclipse.org-common/themes/solstice/public/stylesheets/vendor/cookieconsent/cookieconsent.min.css" />
-        <script src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
-
-        <!-- Eclipse Foundation Google Tag Manager -->
-		<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
-		new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
-		j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
-		'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-		})(window,document,'script','dataLayer','GTM-5WLCZXC');</script>
-		<!-- End Google Tag Manager -->
-
+          <!-- Eclipse Foundation Google Tag Manager -->		
+        <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+        new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+        j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+        'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+        })(window,document,'script','dataLayer','GTM-5WLCZXC');</script>
+        <!-- End Google Tag Manager -->
+     
         <!-- Template Javascript Files
         ================================================== -->
 		<!-- Angular -->
@@ -56,23 +51,16 @@
 		<script src="js/angular-1.7.8.min.js"></script>
 		<script src="angular/capella.js"></script>
 
-        <!-- modernizr js -->
-        <script src="js/vendor/modernizr-2.6.2.min.js"></script>
         <!-- jquery -->
         <script src="js/jquery-3.4.1.min.js"></script>
         <script src="js/popper-1.14.3.min.js"></script>
-        <!-- bootstrap js -->
-        <script src="js/bootstrap.min.js"></script>
-        <!-- wow js -->
-        <script src="js/wow.min.js"></script>
-        <!-- template main js -->
-        <script src="js/main.js"></script>
+		<script defer src="https://kit.fontawesome.com/16cf99803e.js" crossorigin="anonymous"></script>
     </head>
     <body ng-app="capella" data-deferred-cloak>
     	<!-- Google Tag Manager (noscript) -->
-	<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-WCRD68P"
-	height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
-	<!-- End Google Tag Manager (noscript) -->
+		<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-WCRD68P"
+		height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+		<!-- End Google Tag Manager (noscript) -->
     	<!--
         ==================================================
         Header Section
@@ -391,6 +379,17 @@
         Footer Section
         ================================================== -->
         <ng-include src="'angular/blocks/footer.html'"></ng-include>
-        <script async src="js/googleAnalytics.js" ></script>
+ 		<!-- bootstrap js -->
+        <script defer src="js/bootstrap.min.js"></script>
+        <!-- wow js -->
+        <script defer src="js/wow.min.js"></script>
+        <script defer src="js/jquery.fancybox.js"></script>
+        <!-- template main js -->
+        <script defer src="js/main.js"></script>
+        <!-- Global site tag (gtag.js) - Google Analytics -->
+		<script async src="https://www.googletagmanager.com/gtag/js?id=UA-57722280-1"></script>
+		<script async src="js/googleAnalytics.js"></script>
+      
+		<script async src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
     </body>
 </html>
\ No newline at end of file
diff --git a/features.html b/features.html
index 581137c..76d93cb 100644
--- a/features.html
+++ b/features.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="no-js">
+<html lang="en" class="no-js">
     <head>
     	<!-- Google Tag Manager -->
 		<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
@@ -35,12 +35,8 @@
         <link rel="stylesheet" href="css/responsive.css">
         <link rel="stylesheet" href="css/latofonts.css">
 
-        <script src="https://use.fontawesome.com/b51f77a16a.js"></script>
-
         <!-- Cookie content -->
         <link rel="stylesheet" type="text/css" href="//www.eclipse.org/eclipse.org-common/themes/solstice/public/stylesheets/vendor/cookieconsent/cookieconsent.min.css" />
-        <script src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
-
         <!-- Eclipse Foundation Google Tag Manager -->
 		<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
 		new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
@@ -56,17 +52,10 @@
 		<script src="js/angular-1.7.8.min.js"></script>
 		<script src="angular/capella.js"></script>
 
-        <!-- modernizr js -->
-        <script src="js/vendor/modernizr-2.6.2.min.js"></script>
         <!-- jquery -->
         <script src="js/jquery-3.4.1.min.js"></script>
-        <!-- bootstrap js -->
-        <script src="js/bootstrap.min.js"></script>
-        <!-- wow js -->
-        <script src="js/wow.min.js"></script>
-        <script src="js/jquery.fancybox.js"></script>
-        <!-- template main js -->
-        <script src="js/main.js"></script>
+        <script src="js/lazysizes.min.js" async></script>        
+		<script defer src="https://kit.fontawesome.com/16cf99803e.js" crossorigin="anonymous"></script>
     </head>
     <body ng-app="capella" data-deferred-cloak>
     	<!-- Google Tag Manager (noscript) -->
@@ -126,7 +115,7 @@
 									can be displayed as highlighted paths.
 								</p>
 
-								<p class="text-center"><a rel="gallery" class="fancybox" href="images/start/diagrams/OperationalArchitecture.png"><img alt="Operational Architecture" src="images/start/diagrams/OperationalArchitecture.png" width="60%">
+								<p class="text-center"><a rel="gallery" class="fancybox" href="images/start/diagrams/OperationalArchitecture.png"><img class="lazyload" width="680" height="auto" class="lazyload" width="680" height="auto" alt="Operational Architecture" src="images/start/diagrams/OperationalArchitecture.png">
 								</a></p>
 
 								<h3>Capabilities</h3>
@@ -138,7 +127,7 @@
 									Sequence Diagrams.
 								</p>
 
-								<p class="text-center"><a rel="gallery" class="fancybox" href="images/start/diagrams/Capabilities.png"><img alt="[MCB]" src="images/start/diagrams/Capabilities.png" width="60%">
+								<p class="text-center"><a rel="gallery" class="fancybox" href="images/start/diagrams/Capabilities.png"><img class="lazyload" width="680" height="auto" class="lazyload" width="680" height="auto" alt="[MCB]" src="images/start/diagrams/Capabilities.png">
 								</a></p>
 
 								<h3>Dataflows</h3>
@@ -150,7 +139,7 @@
 									categorization of Exchanges, etc. Functional Chains can be
 									displayed as highlighted paths.</p>
 
-								<p class="text-center"><a rel="gallery" class="fancybox" href="images/start/diagrams/dataflows.jpg"><img alt="Dataflows" src="images/start/diagrams/dataflows.jpg" width="60%">
+								<p class="text-center"><a rel="gallery" class="fancybox" href="images/start/diagrams/dataflows.jpg"><img class="lazyload" width="680" height="auto" class="lazyload" width="680" height="auto" alt="Dataflows" src="images/start/diagrams/dataflows.jpg">
 								</a></p>
 
 								<h3>Architecture</h3>
@@ -163,7 +152,7 @@
 									Actors.
 								</p>
 
-								<p class="text-center"><a rel="gallery" class="fancybox" href="images/start/diagrams/architecture_1.jpg"><img alt="Architecture" src="images/start/diagrams/architecture_1.jpg" width="60%">
+								<p class="text-center"><a rel="gallery" class="fancybox" href="images/start/diagrams/architecture_1.jpg"><img class="lazyload" width="680" height="auto" class="lazyload" width="680" height="auto" alt="Architecture" src="images/start/diagrams/architecture_1.jpg">
 								</a></p>
 
 								<p>
@@ -171,7 +160,7 @@
 									of the system. These are called <b>Logical Components</b>.
 								</p>
 
-								<p class="text-center"><a rel="gallery" class="fancybox" href="images/start/diagrams/architecture_2.jpg"><img alt="Architecture" src="images/start/diagrams/architecture_2.jpg" width="60%">
+								<p class="text-center"><a rel="gallery" class="fancybox" href="images/start/diagrams/architecture_2.jpg"><img class="lazyload" width="680" height="auto" class="lazyload" width="680" height="auto" alt="Architecture" src="images/start/diagrams/architecture_2.jpg">
 								</a></p>
 
 								<p>
@@ -180,7 +169,7 @@
 										Components</b> (typically material, but not necessarily).
 								</p>
 
-								<p class="text-center"><a rel="gallery" class="fancybox" href="images/start/diagrams/architecture_3.jpg"><img alt="Architecture" src="images/start/diagrams/architecture_3.jpg" width="60%">
+								<p class="text-center"><a rel="gallery" class="fancybox" href="images/start/diagrams/architecture_3.jpg"><img class="lazyload" width="680" height="auto" class="lazyload" width="680" height="auto" alt="Architecture" src="images/start/diagrams/architecture_3.jpg">
 								</a></p>
 
 								<h3>Trees</h3>
@@ -189,10 +178,10 @@
 									<b>Components</b>. Each node can be folded / unfolded.
 								</p>
 
-								<p class="text-center"><a rel="gallery" class="fancybox" href="images/start/diagrams/tree_1.jpg"><img alt="Trees" src="images/start/diagrams/tree_1.jpg" width="60%">
+								<p class="text-center"><a rel="gallery" class="fancybox" href="images/start/diagrams/tree_1.jpg"><img class="lazyload" width="680" height="auto" class="lazyload" width="680" height="auto" alt="Trees" src="images/start/diagrams/tree_1.jpg">
 								</a></p>
 
-								<p class="text-center"><a rel="gallery" class="fancybox" href="images/start/diagrams/tree_2.jpg"><img alt="Trees" src="images/start/diagrams/tree_2.jpg" width="60%">
+								<p class="text-center"><a rel="gallery" class="fancybox" href="images/start/diagrams/tree_2.jpg"><img class="lazyload" width="680" height="auto" class="lazyload" width="680" height="auto" alt="Trees" src="images/start/diagrams/tree_2.jpg">
 								</a></p>
 
 
@@ -205,7 +194,7 @@
 									messages are Interface Operations). Modes, States and Functions
 									can also be displayed on these diagrams.</p>
 
-								<p class="text-center"><a rel="gallery" class="fancybox" href="images/start/diagrams/scenario.jpg"><img alt="Sequence Diagrams" src="images/start/diagrams/scenario.jpg" width="60%">
+								<p class="text-center"><a rel="gallery" class="fancybox" href="images/start/diagrams/scenario.jpg"><img class="lazyload" width="680" height="auto" class="lazyload" width="680" height="auto" alt="Sequence Diagrams" src="images/start/diagrams/scenario.jpg">
 								</a></p>
 
 								<h3>Modes and States</h3>
@@ -214,7 +203,7 @@
 									Modes / States / Transitions can be related to Functions,
 									Functional Exchanges, Interface Operations, etc.</p>
 
-								<p class="text-center"><a rel="gallery" class="fancybox" href="images/start/diagrams/modesstates.jpg"><img alt="Modes and States" src="images/start/diagrams/modesstates.jpg" width="60%">
+								<p class="text-center"><a rel="gallery" class="fancybox" href="images/start/diagrams/modesstates.jpg"><img class="lazyload" width="680" height="auto" class="lazyload" width="680" height="auto" alt="Modes and States" src="images/start/diagrams/modesstates.jpg">
 								</a></p>
 
 								<h3>Classes and Interfaces</h3>
@@ -223,10 +212,10 @@
 									data structures and relate them to Functional Exchanges,
 									Component or Function Ports, Interfaces, etc.</p>
 
-								<p class="text-center"><a rel="gallery" class="fancybox" href="images/start/diagrams/classesinterfaces_1.jpg"><img alt="Classes Interfaces" src="images/start/diagrams/classesinterfaces_1.jpg" width="60%">
+								<p class="text-center"><a rel="gallery" class="fancybox" href="images/start/diagrams/classesinterfaces_1.jpg"><img class="lazyload" width="680" height="auto" class="lazyload" width="680" height="auto" alt="Classes Interfaces" src="images/start/diagrams/classesinterfaces_1.jpg">
 								</a></p>
 
-								<p class="text-center"><a rel="gallery" class="fancybox" href="images/start/diagrams/classesinterfaces_2.jpg"><img alt="Classes Interfaces" src="images/start/diagrams/classesinterfaces_2.jpg" width="60%">
+								<p class="text-center"><a rel="gallery" class="fancybox" href="images/start/diagrams/classesinterfaces_2.jpg"><img class="lazyload" width="680" height="auto" alt="Classes Interfaces" src="images/start/diagrams/classesinterfaces_2.jpg">
 								</a></p>
 							</div>
 							<div id="tooling" class="tab-pane">
@@ -241,7 +230,7 @@
 								<p><a href="arcadia.html" data-row="#documentation">Read more about Arcadia method <i class="fa fa-arrow-circle-right" aria-hidden="true"></i>
 									</a>
 								</p>
-								<p class="text-center"><a rel="gallery" class="fancybox" href="images/features/overview.png"><img src="images/features/overview.png" alt="" width="60%">
+								<p class="text-center"><a rel="gallery" class="fancybox" href="images/features/overview.png"><img class="lazyload" width="680" height="auto" src="images/features/overview.png" alt="Capella - Methodological Guidance">
 								</a></p>
 
 								<h3>Semantic Colormap</h3>
@@ -252,7 +241,7 @@
 									practitioners, specialty engineers, managers, etc.).</p>
 
 
-								<p class="text-center"><a rel="gallery" class="fancybox" href="images/features/colormap.png"><img src="images/features/colormap.png" alt="" width="60%">
+								<p class="text-center"><a rel="gallery" class="fancybox" href="images/features/colormap.png"><img class="lazyload" width="680" height="auto" src="images/features/colormap.png" alt="Capella - Semantic Colormap">
 								</a></p>
 								<h3>Semantic Browser</h3>
 								<p>
@@ -264,7 +253,7 @@
 								</p>
 
 
-								<p class="text-center"><a rel="gallery" class="fancybox" href="images/features/semantic_browser.png"><img src="images/features/semantic_browser.png" alt="" width="60%">
+								<p class="text-center"><a rel="gallery" class="fancybox" href="images/features/semantic_browser.png"><img class="lazyload" width="680" height="auto" src="images/features/semantic_browser.png" alt="Capella - Semantic Browser">
 								</a></p>
 								<h3>Computed Links</h3>
 								<p>
@@ -280,9 +269,9 @@
 
 								</p>
 
-								<p class="text-center"><a rel="gallery" class="fancybox" href="images/features/complexity_0.png"><img src="images/features/complexity_0.png" alt="" width="60%">
+								<p class="text-center"><a rel="gallery" class="fancybox" href="images/features/complexity_0.png"><img class="lazyload" width="680" height="auto" src="images/features/complexity_0.png" alt="Capella - Computed Links">
 								</a></p>
-								<p class="text-center"><a rel="gallery" class="fancybox" href="images/features/complexity_1.png"><img src="images/features/complexity_1.png" alt="" width="60%">
+								<p class="text-center"><a rel="gallery" class="fancybox" href="images/features/complexity_1.png"><img class="lazyload" width="680" height="auto" src="images/features/complexity_1.png" alt="Capella - Computed Links">
 								</a></p>
 
 								<h3>Advanced Diagram Management</h3>
@@ -301,7 +290,7 @@
 									speciality viewpoints).
 								</p>
 
-								<p class="text-center"><a rel="gallery" class="fancybox" href="images/features/filters.png"><img src="images/features/filters.png" alt="" width="60%">
+								<p class="text-center"><a rel="gallery" class="fancybox" href="images/features/filters.png"><img class="lazyload" width="680" height="auto" src="images/features/filters.png" alt="Capella - Advanced Diagram Management">
 								</a></p>
 								<h3>Model Validation</h3>
 								<p>
@@ -313,13 +302,13 @@
 								</p>
 
 
-								<p class="text-center"><a rel="gallery" class="fancybox" href="images/features/quickfixes.png"><img src="images/features/quickfixes.png" alt="" width="60%">
+								<p class="text-center"><a rel="gallery" class="fancybox" href="images/features/quickfixes.png"><img class="lazyload" width="680" height="auto" src="images/features/quickfixes.png" alt="Capella - Model Validation">
 								</a></p>
 								<h3>Semantic delete with preview</h3>
 								<p>Capella provides
 									instant impact analysis of deletions.</p>
 
-								<p class="text-center"><a rel="gallery" class="fancybox" href="images/features/del_preview.png"><img src="images/features/del_preview.png" alt="" width="60%">
+								<p class="text-center"><a rel="gallery" class="fancybox" href="images/features/del_preview.png"><img class="lazyload" width="680" height="auto" src="images/features/del_preview.png" alt="Capella - Semantic delete with preview">
 								</a></p>
 								<h3>Replicable elements and libraries</h3>
 								<p>
@@ -332,14 +321,14 @@
 									can be shared between several projects.
 								</p>
 
-								<p class="text-center"><a rel="gallery" class="fancybox" href="images/features/rec_rpl.png"><img src="images/features/rec_rpl.png" alt="" width="60%">
+								<p class="text-center"><a rel="gallery" class="fancybox" href="images/features/rec_rpl.png"><img class="lazyload" width="680" height="auto" src="images/features/rec_rpl.png" alt="Capella - Replicable elements and libraries">
 								</a></p>
 								<!--
 								<h3>Modelling Patterns</h3>
 								<p>Recurring
 									modelling schemes can be captured with patterns.</p>
 
-								<p class="text-center"><a rel="gallery" class="fancybox" href="images/features/patterns.png"><img src="images/features/patterns.png" alt="" width="40%">
+								<p class="text-center"><a rel="gallery" class="fancybox" href="images/features/patterns.png"><img class="lazyload" width="680" height="auto" src="images/features/patterns.png" alt="Capella - Modelling Patterns" width="40%">
 								</a></p>
 								-->
 								<h3>Transition System/Subsystems</h3>
@@ -352,7 +341,7 @@
 									transition occurs.
 								</p>
 
-								<p class="text-center"><a rel="gallery" class="fancybox" href="images/features/transition_system_subsystem.png"><img src="images/features/transition_system_subsystem.png" alt="" width="60%">
+								<p class="text-center"><a rel="gallery" class="fancybox" href="images/features/transition_system_subsystem.png"><img class="lazyload" width="680" height="auto" src="images/features/transition_system_subsystem.png" alt="Capella - Transition System/Subsystems">
 								</a></p>
 								<h3>Multi-Viewpoint</h3>
 								<p>
@@ -363,7 +352,7 @@
 									different concerns.
 								</p>
 
-								<p class="text-center"><a rel="gallery" class="fancybox" href="images/features/multi_vp.png"><img src="images/features/multi_vp.png" alt="" width="60%">
+								<p class="text-center"><a rel="gallery" class="fancybox" href="images/features/multi_vp.png"><img class="lazyload" width="680" height="auto" src="images/features/multi_vp.png" alt="Capella - Multi-Viewpoint">
 								</a></p>
 								<h3>HTML output</h3>
 								<p>
@@ -373,7 +362,7 @@
 										activities</b>.
 								</p>
 
-								<p class="text-center"><a rel="gallery" class="fancybox" href="images/features/html.jpg"><img src="images/features/html.jpg" alt="" width="60%">
+								<p class="text-center"><a rel="gallery" class="fancybox" href="images/features/html.jpg"><img class="lazyload" width="680" height="auto" src="images/features/html.jpg" alt="Capella - HTML output">
 								</a></p>
 							</div>
 							<div id="videos" class="tab-pane">
@@ -440,6 +429,20 @@
         Footer Section
         ================================================== -->
         <ng-include src="'angular/blocks/footer.html'"></ng-include>
-        <script async src="js/googleAnalytics.js" ></script>
+
+		 <!-- bootstrap js -->
+        <script defer src="js/bootstrap.min.js"></script>
+        <!-- wow js -->
+        <script defer src="js/wow.min.js"></script>
+        <script defer src="js/jquery.fancybox.js"></script>
+        <!-- template main js -->
+        <script defer src="js/main.js"></script>
+        <!-- Global site tag (gtag.js) - Google Analytics -->
+		<script async src="https://www.googletagmanager.com/gtag/js?id=UA-57722280-1"></script>
+		<script async src="js/googleAnalytics.js"></script>
+        
+        <script async src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
+        <!-- modernizr js -->
+        <script defer src="js/vendor/modernizr-2.6.2.min.js"></script>
     </body>
 </html>
\ No newline at end of file
diff --git a/getstarted.html b/getstarted.html
index b1404a3..f804833 100644
--- a/getstarted.html
+++ b/getstarted.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="no-js">
+<html lang="en" class="no-js">
     <head>
     	<!-- Google Tag Manager -->
 		<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
@@ -35,12 +35,8 @@
         <link rel="stylesheet" href="css/responsive.css">
         <link rel="stylesheet" href="css/latofonts.css">
 
-        <script src="https://use.fontawesome.com/b51f77a16a.js"></script>
-
         <!-- Cookie content -->
         <link rel="stylesheet" type="text/css" href="//www.eclipse.org/eclipse.org-common/themes/solstice/public/stylesheets/vendor/cookieconsent/cookieconsent.min.css" />
-        <script src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
-
         <!-- Eclipse Foundation Google Tag Manager -->
 		<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
 		new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
@@ -56,17 +52,9 @@
 		<script src="js/angular-1.7.8.min.js"></script>
 		<script src="angular/capella.js"></script>
 
-        <!-- modernizr js -->
-        <script src="js/vendor/modernizr-2.6.2.min.js"></script>
         <!-- jquery -->
         <script src="js/jquery-3.4.1.min.js"></script>
-        <!-- bootstrap js -->
-        <script src="js/bootstrap.min.js"></script>
-        <!-- wow js -->
-        <script src="js/wow.min.js"></script>
-        <script src="js/jquery.fancybox.js"></script>
-        <!-- template main js -->
-        <script src="js/main.js"></script>
+		<script defer src="https://kit.fontawesome.com/16cf99803e.js" crossorigin="anonymous"></script>
     </head>
     <body ng-app="capella" data-deferred-cloak>
     	<!-- Google Tag Manager (noscript) -->
@@ -229,6 +217,20 @@
         Footer Section
         ================================================== -->
         <ng-include src="'angular/blocks/footer.html'"></ng-include>
-        <script async src="js/googleAnalytics.js" ></script>
+
+		 <!-- bootstrap js -->
+        <script defer src="js/bootstrap.min.js"></script>
+        <!-- wow js -->
+        <script defer src="js/wow.min.js"></script>
+        <script defer src="js/jquery.fancybox.js"></script>
+        <!-- template main js -->
+        <script defer src="js/main.js"></script>
+        <!-- Global site tag (gtag.js) - Google Analytics -->
+		<script async src="https://www.googletagmanager.com/gtag/js?id=UA-57722280-1"></script>
+		<script async src="js/googleAnalytics.js"></script>
+        
+        <script async src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
+        <!-- modernizr js -->
+        <script defer src="js/vendor/modernizr-2.6.2.min.js"></script>
     </body>
 </html>
\ No newline at end of file
diff --git a/images/banners/banner_addons.jpg b/images/banners/banner_addons.jpg
index 176d1cc..abc2ec1 100644
--- a/images/banners/banner_addons.jpg
+++ b/images/banners/banner_addons.jpg
Binary files differ
diff --git a/images/banners/banner_solution.jpg b/images/banners/banner_solution.jpg
index 5a7ec19..53134ea 100644
--- a/images/banners/banner_solution.jpg
+++ b/images/banners/banner_solution.jpg
Binary files differ
diff --git a/index.html b/index.html
index 37e99bb..d4ee7b6 100644
--- a/index.html
+++ b/index.html
@@ -33,7 +33,7 @@
         <!-- responsive css -->
         <link rel="stylesheet" href="css/responsive.css">
         <link rel="stylesheet" href="css/latofonts.css">
-		<script src="https://kit.fontawesome.com/16cf99803e.js" crossorigin="anonymous"></script>
+        
         <!-- Cookie content -->
         <link rel="stylesheet" type="text/css" href="//www.eclipse.org/eclipse.org-common/themes/solstice/public/stylesheets/vendor/cookieconsent/cookieconsent.min.css" />
         
@@ -46,6 +46,7 @@
         <base href="/capella/">
         <script src="js/angular-1.7.8.min.js"></script>
         <script src="angular/capella.js"></script>
+		<script defer src="https://kit.fontawesome.com/16cf99803e.js" crossorigin="anonymous"></script>
     </head>
     <body ng-app="capella" data-deferred-cloak>
 	    <!-- Google Tag Manager (noscript) -->
@@ -99,7 +100,7 @@
                 </div>
                 <div class="row">
                     <div class="col-sm-4 col-xs-12 wow fadeInLeft" data-wow-duration="500ms" data-wow-delay=".2s">
-                        <p><img data-src="images/icons/icon_safeguard.png" alt="Safeguard Your Deployment" class="lazyload"></p>
+                        <p><img data-src="images/icons/icon_safeguard.png" alt="Safeguard Your Deployment" class="lazyload" width="131" height="131"></p>
                             <div>
                                 <h4>Safeguard Your Deployment</h4>
                                 <p>Benefit from Thales cutting-edge technical & expertise</p>
@@ -107,7 +108,7 @@
                             </div>
                     </div>
                     <div class="col-sm-4 col-xs-12 wow fadeInLeft" data-wow-duration="500ms" data-wow-delay=".3s">
-                        <p><img data-src="images/icons/icon_addons.png" alt="Get Your Complete MBSE Workbench" class="lazyload"></p>
+                        <p><img data-src="images/icons/icon_addons.png" alt="Get Your Complete MBSE Workbench" class="lazyload" width="131" height="131"></p>
                             <div>
                                 <h4>Get Your Complete MBSE Workbench</h4>
                                 <p>Manage requirements, collaboration, documents generation, ...</p>
@@ -115,7 +116,7 @@
                             </div>
                     </div>
                     <div class="col-sm-4 col-xs-12 wow fadeInLeft" data-wow-duration="500ms" data-wow-delay=".4s">
-                       <p><img data-src="images/icons/icon_adapt.png" alt="Adapt to Your Specifics" class="lazyload"></p>
+                       <p><img data-src="images/icons/icon_adapt.png" alt="Adapt to Your Specifics" class="lazyload" width="131" height="131"></p>
                        <div>
                            <h4>Adapt to Your Specifics</h4>
                            <p>Obeo helps you extend Capella to fit your own specific needs</p>
@@ -164,7 +165,7 @@
                     <h3 class="wow fadeInDown" data-wow-delay=".5s">Capella provides methodological guidance, intuitive model editing,<br>and viewing capabilities for Systems, Software and Hardware Architects
                     </h3><br>
                     <div class="col-sm-4 col-xs-12 wow fadeInLeft" data-wow-duration="500ms" data-wow-delay="300ms">
-                            <p><img data-src="images/icons/icon_gear.png" alt="Model-Based Systems Engineering Method" class="lazyload"></p>
+                            <p><img data-src="images/icons/icon_gear.png" alt="Model-Based Systems Engineering Method" class="lazyload" width="131" height="131"></p>
                             <div>
                                 <h4>Model-Based Systems Engineering Method</h4>
                                 <p>Capella relies on Arcadia a field-proven model-based methodology that covers each engineering phase</p>
@@ -173,7 +174,7 @@
                             </div>
                     </div>
                     <div class="col-sm-4 col-xs-12 wow fadeInLeft" data-wow-duration="500ms" data-wow-delay="300ms">
-                            <p><img data-src="images/icons/icon_custom.png" alt="Customizable, Open and Scalable MBSE Tool" class="lazyload"></p>
+                            <p><img data-src="images/icons/icon_custom.png" alt="Customizable, Open and Scalable MBSE Tool" class="lazyload" width="131" height="131"></p>
                             <div>
                                 <h4>Customizable, Open and Scalable MBSE Tool</h4>
                                 <p>Your process, your viewpoints: Capella can be adaptable to your own engineering approach and integrated with your tools</p>
@@ -182,7 +183,7 @@
                             </div>
                     </div>
                     <div class="col-sm-4 col-xs-12 wow fadeInLeft" data-wow-duration="500ms" data-wow-delay="300ms">
-                            <p><img data-src="images/icons/icon_field_proven.png" alt="Successfully Deployed Solution" class="lazyload"></p>
+                            <p><img data-src="images/icons/icon_field_proven.png" alt="Successfully Deployed Solution" class="lazyload" width="131" height="131"></p>
                             <div>
                                 <h4>Successfully Deployed Solution</h4>
                                 <p>Capella is already used on concrete projects in numerous industrial sectors (aerospace, energy, transportation…)</p>
@@ -197,7 +198,34 @@
         ==================================================
         Books
         ================================================== -->
-		<ng-include src="'angular/blocks/books.html'"></ng-include>
+		<section id="books" class="text-center">
+			<div class="container">
+				<div class="section-heading">
+					<h2 class="title wow fadeInDown" data-wow-delay=".3s">Books</h2>
+					<p>Two books thoroughly describe respectively the method and the tool.<br>
+					The Arcadia book describes and illustrates the fundamentals of the method and its contribution to engineering activities.<br>
+					The Capella book is a practical guide to using the workbench. </p>
+				</div>
+				<div class="row">
+					<div class="col-sm-4 col-sm-offset-2 col-xs-12 wow fadeInLeft" data-wow-duration="500ms" data-wow-delay="0ms">
+						<p><a href="https://www.elsevier.com/books/model-based-system-and-architecture-engineering-with-the-arcadia-method/voirin/978-1-78548-169-7" target="_blank"><img src="images/thumbs/thumb_book_jlvoirin.png" alt="Model-based System<br>and Architecture Engineering with the Arcadia Method" class="lazyload" width="311" height="350"></a></p>
+						<div>
+							<h6 class="text-uppercase txt_lightest_grey txt_weight_300">Jean-Luc Voirin</h6>
+							<h4>Model-based System<br>and Architecture Engineering<br>with the Arcadia Method</h4>
+							<p><a class="btn btn-default wow fadeInUp" data-wow-delay=".6s" href="https://www.elsevier.com/books/model-based-system-and-architecture-engineering-with-the-arcadia-method/voirin/978-1-78548-169-7">Read More</a></p>
+						</div>
+					</div>
+					<div class="col-sm-4 col-xs-12 wow fadeInLeft" data-wow-duration="500ms" data-wow-delay="300ms">
+					   <p><a href="https://www.elsevier.com/books/systems-architecture-modeling-with-the-arcadia-method/roques/978-1-78548-168-0" target="_blank"><img src="images/thumbs/thumb_book_proques.png" alt="Systems Architecture Modeling with the Arcadia Method - A Practical Guide to Capella Modeling Tool" class="lazyload" width="311" height="350"></a></p>
+					   <div>
+							<h6 class="text-uppercase txt_lightest_grey txt_weight_300">Pascal Roques</h6>
+							<h4>Systems Architecture Modeling with the Arcadia Method - A Practical Guide to Capella Modeling Tool</h4>
+							<p><a class="btn btn-default wow fadeInUp" data-wow-delay=".6s" href="https://www.elsevier.com/books/systems-architecture-modeling-with-the-arcadia-method/roques/978-1-78548-168-0">Read More</a></p>
+					   </div>
+					</div>
+				</div>
+			</div>
+		</section>
 		<!-- #books -->
         <!--
         ==================================================
@@ -209,7 +237,7 @@
                  <h2 class="title wow fadeInDown" data-wow-delay=".3s">Case-Studies</h2>
                    <div class="row">
                        <div class="col-sm-4 col-xs-12 wow fadeInLeft" data-wow-duration="500ms" data-wow-delay="0ms">
-                         <p><a href="resources/pdf/Case_Study_Rolls_Royce.pdf"><img data-src="images/thumbs/thumb_casestudy_rollsroyce.png" alt="Rolls Royce" class="lazyload"></a></p>
+                         <p><a href="resources/pdf/Case_Study_Rolls_Royce.pdf"><img data-src="images/thumbs/thumb_casestudy_rollsroyce.png" alt="Rolls Royce" class="lazyload" width="297" height="281"></a></p>
                             <div>
                                 <h6 class="text-uppercase txt_lightest_grey txt_weight_300">Aviation</h6>
                                 <h4>Rolls Royce</h4>
@@ -219,7 +247,7 @@
                             </div>
                     	  </div>
                       <div class="col-sm-4 col-xs-12 wow fadeInLeft" data-wow-duration="500ms" data-wow-delay="0ms" >
-                         <p><a href="resources/pdf/Case_Study_ArianeGroup.pdf"><img data-src="images/thumbs/thumb_casestudy_arianegroup.png" alt="Ariane Group" class="lazyload"></a></p>
+                         <p><a href="resources/pdf/Case_Study_ArianeGroup.pdf"><img data-src="images/thumbs/thumb_casestudy_arianegroup.png" alt="Ariane Group" class="lazyload" width="297" height="281"></a></p>
                             <div>
                                 <h6 class="text-uppercase txt_lightest_grey txt_weight_300">Aerospace</h6>
                                 <h4>ArianeGroup</h4>
@@ -229,7 +257,7 @@
                             </div>
                     	</div>
                     	<div class="col-sm-4 col-xs-12 wow fadeInLeft" data-wow-duration="500ms" data-wow-delay="0ms" >
-                         <p><a href="resources/pdf/Case_Study_AutonomousTrain.pdf"><img data-src="images/thumbs/thumb_casestudy_autonomoustrain.png" alt="Railway" width="337" class="lazyload"></a></p>
+                         <p><a href="resources/pdf/Case_Study_AutonomousTrain.pdf"><img data-src="images/thumbs/thumb_casestudy_autonomoustrain.png" alt="Railway" width="337" class="lazyload" width="297" height="281"></a></p>
                             <div>
                                 <h6 class="text-uppercase txt_lightest_grey txt_weight_300">Railway</h6>
                                 <h4>Autonomous Train Project</h4>
@@ -242,7 +270,7 @@
                 <p>&nbsp;</p><p>&nbsp;</p>
                 <div>
                     <div class="col-sm-4 col-xs-12 wow fadeInLeft" data-wow-duration="500ms" data-wow-delay="0ms">
-	                    <p><a href="resources/pdf/Case_Study_Framatome.pdf"><img data-src="images/thumbs/thumb_casestudy_framatome.png" alt="Framatome" class="lazyload"></a>
+	                    <p><a href="resources/pdf/Case_Study_Framatome.pdf"><img data-src="images/thumbs/thumb_casestudy_framatome.png" alt="Framatome" class="lazyload" width="297" height="281"></a>
 	                    </p>
 	                    <div>
 	                        <h6 class="text-uppercase txt_lightest_grey txt_weight_300">Energy</h6><h4>Framatome</h4>
@@ -252,7 +280,7 @@
 	                    </div>
                     </div>
                     <div class="col-sm-4 col-xs-12 wow fadeInLeft" data-wow-duration="500ms" data-wow-delay="0ms">
-	                    <p><a href="resources/pdf/Case_Study_Continental.pdf"><img data-src="images/thumbs/thumb_casestudy_continental.png" alt="Continental" class="lazyload"></a>
+	                    <p><a href="resources/pdf/Case_Study_Continental.pdf"><img data-src="images/thumbs/thumb_casestudy_continental.png" alt="Continental" class="lazyload" width="297" height="281"></a>
 	                    </p>
 	                    <div>
 	                        <h6 class="text-uppercase txt_lightest_grey txt_weight_300">Automotive</h6>
@@ -263,7 +291,7 @@
 	                    </div>
                     </div>
                     <div class="col-sm-4 col-xs-12 wow fadeInLeft" data-wow-duration="500ms" data-wow-delay="0ms">
-	                    <p><a href="resources/pdf/Case_Study_CNES.pdf"><img data-src="images/thumbs/thumb_casestudy_cnes.png" alt="CNES" class="lazyload"></a>
+	                    <p><a href="resources/pdf/Case_Study_CNES.pdf"><img data-src="images/thumbs/thumb_casestudy_cnes.png" alt="CNES" class="lazyload" width="297" height="281"></a>
 	                    </p>
 	                    <div>
 	                        <h6 class="text-uppercase txt_lightest_grey txt_weight_300">Space</h6>
@@ -285,7 +313,7 @@
                       <h2 class="title wow fadeInDown" data-wow-delay=".3s">Capella in action</h2>
                     <div class="col-sm-4 col-xs-12 wow fadeInLeft video_thumbnail" data-wow-duration="500ms" data-wow-delay="0ms">
                             <p>
-                                <a href="https://youtu.be/OGpHMR_j3AM"><img data-src="images/screenshots/embedded_methodological_guidance.png" alt="Embedded methodological guidance" width="100%" class="lazyload"></a>
+                                <a href="https://youtu.be/OGpHMR_j3AM"><img data-src="images/screenshots/embedded_methodological_guidance.png" alt="Embedded methodological guidance" class="lazyload" width="360" height="220"></a>
                             </p>
                             <div>
                                 <h4><a href="https://youtu.be/OGpHMR_j3AM" target="_blank">Embedded methodological guidance</a></h4>
@@ -293,7 +321,7 @@
                     </div>
                     <div class="col-sm-4 col-xs-12 wow fadeInLeft video_thumbnail" data-wow-duration="500ms" data-wow-delay="0ms">
                             <p>
-                                <a href="https://youtu.be/WtwAzftHd4A" target="_blank"><img data-src="images/screenshots/manage_model_complexity.png" alt="Manage model complexity" width="100%" class="lazyload"></a>
+                                <a href="https://youtu.be/WtwAzftHd4A" target="_blank"><img data-src="images/screenshots/manage_model_complexity.png" alt="Manage model complexity" class="lazyload" width="360" height="220"></a>
                             </p>
                             <div>
                                 <h4><a href="https://youtu.be/WtwAzftHd4A" target="_blank">Manage model complexity</a></h4>
@@ -301,7 +329,7 @@
                     </div>
                     <div class="col-sm-4 col-xs-12 wow fadeInLeft video_thumbnail" data-wow-duration="500ms" data-wow-delay="0ms">
                         <p>
-                                <a href="https://youtu.be/cT43CmZM2go" target="_blank"><img data-src="images/screenshots/multiviewpoint_analysis.png" alt="Multi-viewpoint trade-off analysis" width="100%" class="lazyload"></a>
+                                <a href="https://youtu.be/cT43CmZM2go" target="_blank"><img data-src="images/screenshots/multiviewpoint_analysis.png" alt="Multi-viewpoint trade-off analysis" class="lazyload" width="360" height="220"></a>
                             </p>
                             <div>
                                 <h4><a href="https://youtu.be/cT43CmZM2go" target="_blank">Multi-viewpoint trade-off analysis</a></h4>
@@ -361,22 +389,18 @@
         ================================================== -->
         <ng-include src="'angular/blocks/footer.html'"></ng-include>
         
-         <!-- bootstrap js -->
+        <!-- bootstrap js -->
         <script defer src="js/bootstrap.min.js"></script>
         <!-- wow js -->
         <script defer src="js/wow.min.js"></script>
         <script defer src="js/jquery.fancybox.js"></script>
         <!-- template main js -->
         <script defer src="js/main.js"></script>
-        <script defer src="js/googleAnalytics.js" ></script>
-        <script src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
-        <!-- Eclipse Foundation Google Tag Manager -->
-        <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
-        new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
-        j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
-        'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-        })(window,document,'script','dataLayer','GTM-5WLCZXC');</script>
-        <!-- End Google Tag Manager -->
+        <!-- Global site tag (gtag.js) - Google Analytics -->
+		<script async src="https://www.googletagmanager.com/gtag/js?id=UA-57722280-1"></script>
+		<script async src="js/googleAnalytics.js"></script>
+        
+        <script async src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
         <!-- modernizr js -->
         <script defer src="js/vendor/modernizr-2.6.2.min.js"></script>
     </body>
diff --git a/industry-consortium.html b/industry-consortium.html
index cbf6e01..6d1633c 100644
--- a/industry-consortium.html
+++ b/industry-consortium.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="no-js">
+<html lang="en" class="no-js">
     <head>
         <!-- Basic Page Needs
         ================================================== -->
@@ -28,12 +28,8 @@
         <link rel="stylesheet" href="css/responsive.css">
         <link rel="stylesheet" href="css/latofonts.css">
         
-        <script src="https://use.fontawesome.com/b51f77a16a.js"></script>
-        
         <!-- Cookie content -->
         <link rel="stylesheet" type="text/css" href="//www.eclipse.org/eclipse.org-common/themes/solstice/public/stylesheets/vendor/cookieconsent/cookieconsent.min.css" />
-        <script src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
-        
         <!-- Eclipse Foundation Google Tag Manager -->
 		<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
 		new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
@@ -49,17 +45,9 @@
 		<script src="js/angular-1.7.8.min.js"></script>
 		<script src="angular/capella.js"></script>
 
-        <!-- modernizr js -->
-        <script src="js/vendor/modernizr-2.6.2.min.js"></script>
         <!-- jquery -->
         <script src="js/jquery-3.4.1.min.js"></script>
-        <!-- bootstrap js -->
-        <script src="js/bootstrap.min.js"></script>
-        <!-- wow js -->
-        <script src="js/wow.min.js"></script>
-        <script src="js/jquery.fancybox.js"></script>
-        <!-- template main js -->
-        <script src="js/main.js"></script>
+		<script defer src="https://kit.fontawesome.com/16cf99803e.js" crossorigin="anonymous"></script>
         <!-- display videos in fancybox -->
         <script type="text/javascript">
             $(document).ready(function() {
@@ -147,7 +135,7 @@
 					<br>
 					<h3>Goals</h3>
 					<p>Capella IC provides to its members an open governance on several axis related to Capella tool, add-ons and underlying technologies:</p>
-					<p><a rel="gallery" class="fancybox" href="images/industry_consortium/schema_capella_ic.png"><img class="center" src="images/industry_consortium/schema_capella_ic.png" alt="" width="60%"></a>
+					<p><a rel="gallery" class="fancybox" href="images/industry_consortium/schema_capella_ic.png"><img class="center" src="images/industry_consortium/schema_capella_ic.png" alt="Capella IC" width="60%"></a>
 					
 					<ul>
 						<li>Knowledge Sharing: case studies, technology watch, private exchange workshops on N&N</li>
@@ -238,6 +226,19 @@
         Footer Section
         ================================================== -->
         <ng-include src="'angular/blocks/footer.html'"></ng-include>
-        <script async src="js/googleAnalytics.js" ></script>
-    </body>
+<!-- bootstrap js -->
+        <script defer src="js/bootstrap.min.js"></script>
+        <!-- wow js -->
+        <script defer src="js/wow.min.js"></script>
+        <script defer src="js/jquery.fancybox.js"></script>
+        <!-- template main js -->
+        <script defer src="js/main.js"></script>
+        <!-- Global site tag (gtag.js) - Google Analytics -->
+		<script async src="https://www.googletagmanager.com/gtag/js?id=UA-57722280-1"></script>
+		<script async src="js/googleAnalytics.js"></script>
+        
+        <script async src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
+        <!-- modernizr js -->
+        <script defer src="js/vendor/modernizr-2.6.2.min.js"></script>
+	</body>
 </html>
\ No newline at end of file
diff --git a/js/googleAnalytics.js b/js/googleAnalytics.js
index 36d9ded..2257060 100644
--- a/js/googleAnalytics.js
+++ b/js/googleAnalytics.js
@@ -1,8 +1,5 @@
-if (document.cookie.valueOf('eclipse_cookieconsent_status').search("allow") > -1) {
-	(function(i, s, o, g, r, a, m) {i['GoogleAnalyticsObject'] = r;i[r] = i[r] || function() {
-	(i[r].q = i[r].q || []).push(arguments)}, i[r].l = 1 * new Date();
-	a = s.createElement(o), m = s.getElementsByTagName(o)[0];a.async = 1;a.src = g;m.parentNode.insertBefore(a, m)
-	})(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
-}
-ga('create', 'UA-57722280-1', 'auto');
-ga('send', 'pageview');
\ No newline at end of file
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'UA-57722280-1');
diff --git a/json/downloads.json b/json/downloads.json
index 6517e60..af2397b 100644
--- a/json/downloads.json
+++ b/json/downloads.json
@@ -11,7 +11,7 @@
       "product": { "text": "Product", "icon": "fa fa-download" },
       "installAddon": { "text": "Installation procedure", "icon": "fa fa-external-link-square", "target":"_blank" },
       "dandi": { "text": "Download and Installation", "icon": "fa fa-download" },
-      "learnMore": { "text": "Learn More", "icon": "fa fa-arrow-circle-right", "target":"_blank" },
+      "learnMore": { "text": "Read more about this add-on", "icon": "fa fa-arrow-circle-right" },
       "windows": { "text": "Windows", "icon": "fa fa-windows", "key":"WIN" },
       "linux": { "text": "Linux*", "icon": "fa fa-linux", "key":"LINUX" },
       "mac": { "text": "Mac Cocoa*", "icon": "fa fa-apple", "key":"MAC" },
diff --git a/resources.html b/resources.html
index 8b4674d..a39fc72 100644
--- a/resources.html
+++ b/resources.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="no-js">
+<html lang="en" class="no-js">
 <head>
 	<!-- Google Tag Manager -->
 		<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
@@ -32,10 +32,9 @@
 <!-- responsive css -->
 <link rel="stylesheet" href="css/responsive.css">
 <link rel="stylesheet" href="css/latofonts.css">
-<script src="https://use.fontawesome.com/b51f77a16a.js"></script>
+
 <!-- Cookie content -->
 <link rel="stylesheet" type="text/css" href="//www.eclipse.org/eclipse.org-common/themes/solstice/public/stylesheets/vendor/cookieconsent/cookieconsent.min.css" />
-<script async src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
 <!-- Eclipse Foundation Google Tag Manager -->
 <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
 new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
@@ -49,16 +48,9 @@
 <base href="/capella/">
 <script src="js/angular-1.7.8.min.js"></script>
 <script src="angular/capella.js"></script>
-<!-- modernizr js -->
-<script src="js/vendor/modernizr-2.6.2.min.js"></script>
 <!-- jquery -->
 <script src="js/jquery-3.4.1.min.js"></script>
-<!-- bootstrap js -->
-<script src="js/bootstrap.min.js"></script>
-<!-- wow js -->
-<script src="js/wow.min.js"></script>
-<!-- template main js -->
-<script src="js/main.js"></script>
+		<script defer src="https://kit.fontawesome.com/16cf99803e.js" crossorigin="anonymous"></script>
 </head>
 <body ng-app="capella" data-deferred-cloak>
 	<!-- Google Tag Manager (noscript) -->
@@ -300,7 +292,21 @@
         Footer Section
         ================================================== -->
 	<ng-include src="'angular/blocks/footer.html'"></ng-include>
-	<script async src="js/googleAnalytics.js" ></script>
+
+	 <!-- bootstrap js -->
+        <script defer src="js/bootstrap.min.js"></script>
+        <!-- wow js -->
+        <script defer src="js/wow.min.js"></script>
+        <script defer src="js/jquery.fancybox.js"></script>
+        <!-- template main js -->
+        <script defer src="js/main.js"></script>
+        <!-- Global site tag (gtag.js) - Google Analytics -->
+		<script async src="https://www.googletagmanager.com/gtag/js?id=UA-57722280-1"></script>
+		<script async src="js/googleAnalytics.js"></script>
+        
+        <script async src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
+        <!-- modernizr js -->
+        <script defer src="js/vendor/modernizr-2.6.2.min.js"></script>
 </body>
 </html>
 
diff --git a/services.html b/services.html
index 1a52e1f..c1e7829 100644
--- a/services.html
+++ b/services.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="no-js">
+<html lang="en" class="no-js">
     <head>
     	<!-- Google Tag Manager -->
 		<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
@@ -34,12 +34,8 @@
         <link rel="stylesheet" href="css/responsive.css">
         <link rel="stylesheet" href="css/latofonts.css">
 
-        <script src="https://use.fontawesome.com/b51f77a16a.js"></script>
-
         <!-- Cookie content -->
         <link rel="stylesheet" type="text/css" href="//www.eclipse.org/eclipse.org-common/themes/solstice/public/stylesheets/vendor/cookieconsent/cookieconsent.min.css" />
-        <script src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
-
         <!-- Eclipse Foundation Google Tag Manager -->
 		<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
 		new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
@@ -55,17 +51,9 @@
 		<script src="js/angular-1.7.8.min.js"></script>
 		<script src="angular/capella.js"></script>
 
-        <!-- modernizr js -->
-        <script src="js/vendor/modernizr-2.6.2.min.js"></script>
         <!-- jquery -->
         <script src="js/jquery-3.4.1.min.js"></script>
-        <!-- bootstrap js -->
-        <script src="js/bootstrap.min.js"></script>
-        <!-- wow js -->
-        <script src="js/wow.min.js"></script>
-        <!-- template main js -->
-        <script src="js/main.js"></script>
-
+		<script defer src="https://kit.fontawesome.com/16cf99803e.js" crossorigin="anonymous"></script>       
     </head>
     <body ng-app="capella" data-deferred-cloak>
 	<!-- Google Tag Manager (noscript) -->
@@ -110,7 +98,7 @@
 
                 <div class="row">
                 	<div class="col-sm-4 col-xs-12 wow fadeInLeft animated" data-wow-duration="500ms" data-wow-delay="0ms">
-                        	 <p><img src="images/icons/icon_training.png" alt="" ></p>
+                        	 <p><img src="images/icons/icon_training.png" alt="Capella - Training & Coaching"></p>
                             <div>
                                 <h4>Training & Coaching</h4>
                                 <p>Develop your team’s skills on Capella: training, assistance for deployment, methodological coaching</p>
@@ -121,7 +109,7 @@
                             </div>
                     </div>
                     <div class="col-sm-4 col-xs-12 wow fadeInLeft animated" data-wow-duration="500ms" data-wow-delay="100ms">
-                            <p><img src="images/icons/icon_custom.png" alt="" ></p>
+                            <p><img src="images/icons/icon_custom.png" alt="Capella - Integration & Customization"></p>
                            <div>
                                 <h4>Integration & Customization</h4>
                                 <p>Integrate Capella with other tools and extend the workbench for your particular engineering concerns</p>
@@ -130,7 +118,7 @@
                             </div>
                     </div>
                     <div class="col-sm-4 col-xs-12 wow fadeInLeft animated" data-wow-duration="500ms" data-wow-delay="200ms">
-                            <p><img src="images/icons/icon_safeguard.png" alt="" ></p>
+                            <p><img src="images/icons/icon_safeguard.png" alt="Capella - Support & Maintenance"></p>
                             <div>
                                 <h4>Support & Maintenance</h4>
                                 <p>Get a commitment regarding response times: answers to technical queries, bug fixes, change requests</p>
@@ -168,7 +156,20 @@
         Footer Section
         ================================================== -->
         <ng-include src="'angular/blocks/footer.html'"></ng-include>
-        <script async src="js/googleAnalytics.js" ></script>
 
+		 <!-- bootstrap js -->
+        <script defer src="js/bootstrap.min.js"></script>
+        <!-- wow js -->
+        <script defer src="js/wow.min.js"></script>
+        <script defer src="js/jquery.fancybox.js"></script>
+        <!-- template main js -->
+        <script defer src="js/main.js"></script>
+        <!-- Global site tag (gtag.js) - Google Analytics -->
+		<script async src="https://www.googletagmanager.com/gtag/js?id=UA-57722280-1"></script>
+		<script async src="js/googleAnalytics.js"></script>
+        
+        <script async src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
+        <!-- modernizr js -->
+        <script defer src="js/vendor/modernizr-2.6.2.min.js"></script>
     </body>
 </html>
\ No newline at end of file
diff --git a/support.html b/support.html
index 029a8a2..f1b31b9 100644
--- a/support.html
+++ b/support.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="no-js">
+<html lang="en" class="no-js">
     <head>
     	<!-- Google Tag Manager -->
 		<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
@@ -33,12 +33,9 @@
         <!-- responsive css -->
         <link rel="stylesheet" href="css/responsive.css">
 		<link rel="stylesheet" href="css/latofonts.css">
-        <script src="https://use.fontawesome.com/b51f77a16a.js"></script>
 
         <!-- Cookie content -->
         <link rel="stylesheet" type="text/css" href="//www.eclipse.org/eclipse.org-common/themes/solstice/public/stylesheets/vendor/cookieconsent/cookieconsent.min.css" />
-        <script src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
-
         <!-- Eclipse Foundation Google Tag Manager -->
 		<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
 		new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
@@ -53,16 +50,10 @@
 		<base href="/capella/">
 		<script src="js/angular-1.7.8.min.js"></script>
 		<script src="angular/capella.js"></script>
-        <!-- modernizr js -->
-        <script src="js/vendor/modernizr-2.6.2.min.js"></script>
+        
         <!-- jquery -->
         <script src="js/jquery-3.4.1.min.js"></script>
-        <!-- bootstrap js -->
-        <script src="js/bootstrap.min.js"></script>
-        <!-- wow js -->
-        <script src="js/wow.min.js"></script>
-        <!-- template main js -->
-        <script src="js/main.js"></script>
+        <script defer src="https://kit.fontawesome.com/16cf99803e.js" crossorigin="anonymous"></script>
     </head>
     <body ng-app="capella" data-deferred-cloak>
     	<!-- Google Tag Manager (noscript) -->
@@ -189,6 +180,20 @@
         Footer Section
         ================================================== -->
         <ng-include src="'angular/blocks/footer.html'"></ng-include>
-        <script async src="js/googleAnalytics.js" ></script>
+
+		 <!-- bootstrap js -->
+        <script defer src="js/bootstrap.min.js"></script>
+        <!-- wow js -->
+        <script defer src="js/wow.min.js"></script>
+        <script defer src="js/jquery.fancybox.js"></script>
+        <!-- template main js -->
+        <script defer src="js/main.js"></script>
+        <!-- Global site tag (gtag.js) - Google Analytics -->
+		<script async src="https://www.googletagmanager.com/gtag/js?id=UA-57722280-1"></script>
+		<script async src="js/googleAnalytics.js"></script>
+        
+        <script async src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
+        <!-- modernizr js -->
+        <script defer src="js/vendor/modernizr-2.6.2.min.js"></script>
     </body>
 </html>
\ No newline at end of file
diff --git a/webinars.html b/webinars.html
index 38e7d18..b9d2ec5 100644
--- a/webinars.html
+++ b/webinars.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="no-js">
+<html lang="en" class="no-js">
 <head>
 	<!-- Google Tag Manager -->
 		<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
@@ -34,12 +34,10 @@
 	<!-- responsive css -->
 	<link rel="stylesheet" href="css/responsive.css">
 	<link rel="stylesheet" href="css/latofonts.css">
-	<script src="https://use.fontawesome.com/b51f77a16a.js"></script>
+
 	<!-- Cookie content -->
 	<link rel="stylesheet" type="text/css"
 		href="//www.eclipse.org/eclipse.org-common/themes/solstice/public/stylesheets/vendor/cookieconsent/cookieconsent.min.css" />
-	<script
-		src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
 	<!-- Eclipse Foundation Google Tag Manager -->
 	<script>
 		(function (w, d, s, l, i) {
@@ -63,17 +61,11 @@
 	<base href="/capella/">
 	<script src="js/angular-1.7.8.min.js"></script>
 	<script src="angular/capella.js"></script>
-	<!-- modernizr js -->
-	<script src="js/vendor/modernizr-2.6.2.min.js"></script>
+	
 	<!-- jquery -->
 	<script src="js/jquery-3.4.1.min.js"></script>
-	<!-- bootstrap js -->
-	<script src="js/bootstrap.min.js"></script>
-	<!-- wow js -->
-	<script src="js/wow.min.js"></script>
-	<script src="js/jquery.fancybox.js"></script>
-	<!-- template main js -->
-	<script src="js/main.js"></script>
+	<script defer src="https://kit.fontawesome.com/16cf99803e.js" crossorigin="anonymous"></script>
+
 </head>
 <body ng-app="capella" data-deferred-cloak>
 	<!-- Google Tag Manager (noscript) -->
@@ -125,7 +117,7 @@
                     </div>
             </div>
             <div class="col-sm-4 col-xs-12 wow fadeInLeft" data-wow-duration="500ms" data-wow-delay="300ms">
-               <p><img src="images/icons/icon_slideshare.png" alt="" ></p>
+               <p><img src="images/icons/icon_slideshare.png" alt="Capella - Slideshares" ></p>
                <div>
                    <h4>Slideshare clipboard</h4>
                    <p>Check the Capella webinars' slides</p>
@@ -162,6 +154,19 @@
         Footer Section
         ================================================== -->
 	<ng-include src="'angular/blocks/footer.html'"></ng-include>
-	<script async src="js/googleAnalytics.js"></script>
+		 <!-- bootstrap js -->
+        <script defer src="js/bootstrap.min.js"></script>
+        <!-- wow js -->
+        <script defer src="js/wow.min.js"></script>
+        <script defer src="js/jquery.fancybox.js"></script>
+        <!-- template main js -->
+        <script defer src="js/main.js"></script>
+        <!-- Global site tag (gtag.js) - Google Analytics -->
+		<script async src="https://www.googletagmanager.com/gtag/js?id=UA-57722280-1"></script>
+		<script async src="js/googleAnalytics.js"></script>
+        
+        <script async src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
+        <!-- modernizr js -->
+        <script defer src="js/vendor/modernizr-2.6.2.min.js"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/what_is_mbse.html b/what_is_mbse.html
index 41e36cd..63ba95c 100644
--- a/what_is_mbse.html
+++ b/what_is_mbse.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="no-js">
+<html lang="en" class="no-js">
     <head>
     	<!-- Google Tag Manager -->
 		<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
@@ -34,13 +34,9 @@
         <!-- responsive css -->
         <link rel="stylesheet" href="css/responsive.css">
         <link rel="stylesheet" href="css/latofonts.css">
-        
-        <script src="https://use.fontawesome.com/b51f77a16a.js"></script>
-        
+                
         <!-- Cookie content -->
         <link rel="stylesheet" type="text/css" href="//www.eclipse.org/eclipse.org-common/themes/solstice/public/stylesheets/vendor/cookieconsent/cookieconsent.min.css" />
-        <script src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
-        
         <!-- Eclipse Foundation Google Tag Manager -->
 		<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
 		new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
@@ -56,17 +52,10 @@
 		<script src="js/angular-1.7.8.min.js"></script>
 		<script src="angular/capella.js"></script>
 
-        <!-- modernizr js -->
-        <script src="js/vendor/modernizr-2.6.2.min.js"></script>
         <!-- jquery -->
         <script src="js/jquery-3.4.1.min.js"></script>
-        <!-- bootstrap js -->
-        <script src="js/bootstrap.min.js"></script>
-        <!-- wow js -->
-        <script src="js/wow.min.js"></script>
-        <script src="js/jquery.fancybox.js"></script>
-        <!-- template main js -->
-        <script src="js/main.js"></script>
+        <script defer src="https://kit.fontawesome.com/16cf99803e.js" crossorigin="anonymous"></script>
+        
     </head>
     <body ng-app="capella" data-deferred-cloak>
 		<!-- Google Tag Manager (noscript) -->
@@ -176,7 +165,20 @@
         Footer Section
         ================================================== -->
         <ng-include src="'angular/blocks/footer.html'"></ng-include>
-        <script async src="js/googleAnalytics.js" ></script>
+		
+		 <!-- bootstrap js -->
+        <script defer src="js/bootstrap.min.js"></script>
+        <!-- wow js -->
+        <script defer src="js/wow.min.js"></script>
+        <script defer src="js/jquery.fancybox.js"></script>
+        <!-- template main js -->
+        <script defer src="js/main.js"></script>
+        <!-- Global site tag (gtag.js) - Google Analytics -->
+		<script async src="https://www.googletagmanager.com/gtag/js?id=UA-57722280-1"></script>
+		<script async src="js/googleAnalytics.js"></script>
         
+        <script async src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
+        <!-- modernizr js -->
+        <script defer src="js/vendor/modernizr-2.6.2.min.js"></script>        
     </body>
 </html>
\ No newline at end of file