diff --git a/_includes/call-to-action.html b/_includes/call-to-action.html
index acbe100..069be6a 100755
--- a/_includes/call-to-action.html
+++ b/_includes/call-to-action.html
@@ -3,7 +3,7 @@
         <div class="row">
             <div class="col-md-8 col-md-offset-2">
                 <h2 class="section-heading">Comunic  is everywhere!</h2>
-                <p>Our app is available on Web and in the browser for now!</p>
+                <p>Use Comunic in your browser or on Android!</p>
                 <div class="badges">
                     <a class="btn btn-outline btn-xl" href="{{ site.app_url }}">Web Application</a> 
                     <a class="badge-link" href="#"><img src="/img/google-play-badge.svg" alt=""></a>
diff --git a/_includes/feature.html b/_includes/feature.html
index 8524311..eddcb93 100644
--- a/_includes/feature.html
+++ b/_includes/feature.html
@@ -2,7 +2,7 @@
     <div class="container">
         <div class="row">
             <div class="col-lg-12 text-center">
-                <h2 class="section-heading">At Your Service</h2>
+                <h2 class="section-heading">Get started now</h2>
                 <hr class="primary">
                 <br />
             </div>
@@ -12,30 +12,30 @@
         <div class="row">
             <div class="col-lg-3 col-md-6 text-center">
                 <div class="service-box">
-                    <i class="fa fa-4x fa-diamond wow bounceIn text-primary"></i>
-                    <h3>Sturdy Templates</h3>
-                    <p class="text-muted">Our templates are updated regularly so they don't break.</p>
+                    <i class="fa fa-4x fa-pencil wow bounceIn text-primary"></i>
+                    <h3><a href="{{site.app_url}}create_account">Create an account</a></h3>
+                    <p class="text-muted">Create an account to use all Comunic features.</p>
                 </div>
             </div>
             <div class="col-lg-3 col-md-6 text-center">
                 <div class="service-box">
-                    <i class="fa fa-4x fa-paper-plane wow bounceIn text-primary" data-wow-delay=".1s"></i>
-                    <h3>Ready to Ship</h3>
-                    <p class="text-muted">You can use this theme as is, or you can make changes!</p>
+                    <i class="fa fa-4x fa-dollar wow bounceIn text-primary" data-wow-delay=".1s"></i>
+                    <h3>Make a donation</h3>
+                    <p class="text-muted">Maintaining a social network is not free, do not hesitate to help!</p>
                 </div>
             </div>
             <div class="col-lg-3 col-md-6 text-center">
                 <div class="service-box">
-                    <i class="fa fa-4x fa-newspaper-o wow bounceIn text-primary" data-wow-delay=".2s"></i>
-                    <h3>Up to Date</h3>
-                    <p class="text-muted">We update dependencies to keep things fresh.</p>
+                    <i class="fa fa-4x fa-bug wow bounceIn text-primary" data-wow-delay=".3s"></i>
+                    <h3>Report bugs</h3>
+                    <p class="text-muted">Do not hesitate to report any unexcepted behaviour!</p>
                 </div>
             </div>
             <div class="col-lg-3 col-md-6 text-center">
                 <div class="service-box">
-                    <i class="fa fa-4x fa-heart wow bounceIn text-primary" data-wow-delay=".3s"></i>
-                    <h3>Made with Love</h3>
-                    <p class="text-muted">You have to make your websites with love these days!</p>
+                    <i class="fa fa-4x fa-code wow bounceIn text-primary" data-wow-delay=".2s"></i>
+                    <h3>Developers</h3>
+                    <p class="text-muted">As developer, do not hesitate to visit our developer website!</p>
                 </div>
             </div>
         </div>
diff --git a/_includes/quote.html b/_includes/quote.html
index bb78258..8e48b13 100644
--- a/_includes/quote.html
+++ b/_includes/quote.html
@@ -2,8 +2,7 @@
     <div class="container">
         <div class="row">
             <div class="col-md-8 col-md-offset-2">
-                <h2 class="section-heading">Stay ready to go! <i style="color:brown"class="fa fa-coffee"></i></h2>
-                <p>get started!</p>
+                <h2 class="section-heading">Privacy is a fundamental right.</h2>
             </div>
         </div>
     </div>
diff --git a/_layouts/front.html b/_layouts/front.html
index c5c41c9..ac1c433 100755
--- a/_layouts/front.html
+++ b/_layouts/front.html
@@ -4,16 +4,27 @@
 {% include head.html %}
 
 <body id="page-top">
-  {% include nav.html %}
-  {% include header.html %}
-  {% include call-to-action.html %}
-  {% include services.html %}
-  {% include portfolio.html %}
-  {% include feature.html %}
-  {% include quote.html %}
-  {% include aside.html %}
-  {% include contact.html %}
-  {% include scripts.html %}
+	<!-- Navbar -->
+	{% include nav.html %}
+
+	<!-- Main home block page -->
+	{% include header.html %}
+
+	<!-- Link to web app / android app -->
+	{% include call-to-action.html %}
+
+	<!-- Comunic features -->
+	{% include services.html %}
+
+	<!-- Quote -->
+	{% include quote.html %}
+
+	<!-- Other features link -->
+	{% include feature.html %}
+	
+	{% include aside.html %}
+	{% include contact.html %}
+	{% include scripts.html %}
 </body>
 
 </html>