1. Changed index page for better informing of the users about releases.
2. Added known users and fixed headers.
3. Removed survey links because it looks like the method is unmaintained and doesn't work in practice.
diff --git a/content/index.html b/content/index.html
index 2f95c5a..5a7760a 100644
--- a/content/index.html
+++ b/content/index.html
@@ -141,11 +141,6 @@
           <div class="col-lg-4">
             <img src="images/monkey.png" style="width: 210px; margin-left: 115px;" alt="Cloud friendly">
           </div>
-		  <div class="col-lg-3" style="margin-left: 77%;margin-top: 3.5%;">
-				<a href="https://www.apache.org/events/current-event.html">
-					<img src="https://www.apache.org/events/current-event-234x60.png">
-				</a>
-		  </div>
         </div>
       </div>
     </div>
@@ -222,12 +217,20 @@
 		<div class="panel-body">
 
 		<p class="text-warning">Apache CloudStack 4.11.1.0 is out!</p>
+		<p>This is current CloudStack LTS release.</p>
 
-		<p>
-		Looking for other versions of Apache CloudStack? You can find our archives on the download page as well.
+		<a href="downloads.html"><button type="button" class="btn btn-success">Download</button></a>
+		<a href="http://docs.cloudstack.apache.org/en/4.11.1.0/"><button type="button" class="btn btn-success">Documentation</button></a>
+		
+		<p style="margin-top: 20px;">If you prefer proven stability rather than the newest features, please take a look at the previous LTS release.</p>
+		<p class="text-warning">Previous Apache CloudStack LTS Release is 4.9.3.1.</p>
+		<a href="downloads.html"><button type="button" class="btn btn-success">Download</button></a>
+		<a href="http://docs.cloudstack.apache.org/projects/cloudstack-installation/en/4.9/"><button type="button" class="btn btn-success">Documentation</button></a>
+
+		<p style="margin-top: 20px;">
+		Looking for other versions of Apache CloudStack? You can find our archives on the <a href="downloads.html">downloads</a> page as well.
 		</p>
 
-		<a href="downloads.html"><button type="button" class="btn btn-success">Download Now</button></a>
 
 		</div>
 
diff --git a/content/users.html b/content/users.html
index a91f60f..00ab7c0 100644
--- a/content/users.html
+++ b/content/users.html
@@ -146,13 +146,13 @@
 
 <p>Our users include many major service providers running CloudStack to offer public cloud services, product vendors who incorporate or integrate with Cloudstack in their own products, organisations who have used Cloudstack to build their own private clouds, and systems integrators that offer CloudStack related services.</p>
 
-<p><strong>Are you using CloudStack ?</strong></p>
+<h2 id="how-to-add-your-company-in-the-list">How to Add your Company in The List</h2>
 
-<p>If you are using CloudStack in your organisation and your company is not listed here, please complete our brief adoption <a href="survey.html">survey</a>. We’re happy to keep your company name anonymous if you require.</p>
+<p>If you are using CloudStack in your organisation and your company is not listed here, please send a pull request to the GitHub <a href="https://github.com/apache/cloudstack-www/blob/master/source/users.markdown">page</a>.</p>
 
-<p><strong>Noticed Something wrong ?</strong></p>
+<h2 id="how-to-request-the-entry-removal-or-change">How to Request the Entry Removal or Change</h2>
 
-<p>If you noticed something wrong  with your entry here (or if you’d like us to remove it), please complete our adoption <a href="survey.html">survey</a>. We will use the information you give us in this survey to update the contents of this page</p>
+<p>If you noticed something wrong with your entry here (or if you’d like us to remove it), please send a pull request to the GitHub <a href="https://github.com/apache/cloudstack-www/blob/master/source/users.markdown">page</a> or write your concerns to the mail-list <strong>users@cloudstack.apache.org</strong>.</p>
 
 <ul>
   <li><a href="http://www.actonmagic.com">ActOnMagic</a></li>
@@ -182,6 +182,7 @@
   <li><a href="http://nectar.org.au">Melbourne University</a></li>
   <li><a href="http://www.miriadis.com">Miriadis</a></li>
   <li><a href="http://neobitti.fi">Neobitti</a></li>
+  <li><a href="https://netpoint-dc.com/">NetPoint</a></li>
   <li><a href="http://www.openminds.be">Openminds</a></li>
   <li><a href="http://stacksquare.com">Overweb srl</a></li>
   <li><a href="http://polcom.com.pl">Polcom</a></li>
diff --git a/data/cloudstack.yml b/data/cloudstack.yml
index e1a5d03..260549a 100644
--- a/data/cloudstack.yml
+++ b/data/cloudstack.yml
@@ -1,7 +1,10 @@
 versions:
   main: 4.11.1.0
+  main_islts: LTS
+  main_docs_url: http://docs.cloudstack.apache.org/en/4.11.1.0/
   branch: 4.11
   lts: 4.9.3.1
+  lts_docs_url: http://docs.cloudstack.apache.org/projects/cloudstack-installation/en/4.9/
   ltsbranch: 4.9
   archives:
     - '4.11':
diff --git a/source/index.html.erb b/source/index.html.erb
index 6c83148..d23e0db 100644
--- a/source/index.html.erb
+++ b/source/index.html.erb
@@ -15,11 +15,6 @@
           <div class="col-lg-4">
             <img src="images/monkey.png" style="width: 210px; margin-left: 115px;" alt="Cloud friendly">
           </div>
-		  <div class="col-lg-3" style="margin-left: 77%;margin-top: 3.5%;">
-				<a href="https://www.apache.org/events/current-event.html">
-					<img src="https://www.apache.org/events/current-event-234x60.png">
-				</a>
-		  </div>
         </div>
       </div>
     </div>
@@ -96,12 +91,24 @@
 		<div class="panel-body">
 
 		<p class="text-warning">Apache CloudStack <%= data.cloudstack.versions.main %> is out!</p>
+		<% if data.cloudstack.versions.main_islts %>
+		<p>This is current CloudStack LTS release.</p>
+		<% else %>
+		<p>This is non-LTS release of CloudStack.</p>
+		<% end %>
 
-		<p>
-		Looking for other versions of Apache CloudStack? You can find our archives on the download page as well.
+		<a href="downloads.html"><button type="button" class="btn btn-success">Download</button></a>
+		<a href="<%= data.cloudstack.versions.main_docs_url %>"><button type="button" class="btn btn-success">Documentation</button></a>
+		
+		<p style="margin-top: 20px;">If you prefer proven stability rather than the newest features, please take a look at the previous LTS release.</p>
+		<p class="text-warning">Previous Apache CloudStack LTS Release is <%= data.cloudstack.versions.lts %>.</p>
+		<a href="downloads.html"><button type="button" class="btn btn-success">Download</button></a>
+		<a href="<%= data.cloudstack.versions.lts_docs_url %>"><button type="button" class="btn btn-success">Documentation</button></a>
+
+		<p style="margin-top: 20px;">
+		Looking for other versions of Apache CloudStack? You can find our archives on the <a href="downloads.html">downloads</a> page as well.
 		</p>
 
-		<a href="downloads.html"><button type="button" class="btn btn-success">Download Now</button></a>
 
 		</div>
 
diff --git a/source/users.markdown b/source/users.markdown
index bb5de01..b2ff198 100644
--- a/source/users.markdown
+++ b/source/users.markdown
@@ -20,13 +20,13 @@
 
 Our users include many major service providers running CloudStack to offer public cloud services, product vendors who incorporate or integrate with Cloudstack in their own products, organisations who have used Cloudstack to build their own private clouds, and systems integrators that offer CloudStack related services.
 
-**Are you using CloudStack ?**
+## How to Add your Company in The List
 
-If you are using CloudStack in your organisation and your company is not listed here, please complete our brief adoption [survey](/survey.html). We’re happy to keep your company name anonymous if you require.
+If you are using CloudStack in your organisation and your company is not listed here, please send a pull request to the GitHub [page](https://github.com/apache/cloudstack-www/blob/master/source/users.markdown).
 
-**Noticed Something wrong ?**
+## How to Request the Entry Removal or Change
 
-If you noticed something wrong  with your entry here (or if you’d like us to remove it), please complete our adoption [survey](/survey.html). We will use the information you give us in this survey to update the contents of this page
+If you noticed something wrong with your entry here (or if you’d like us to remove it), please send a pull request to the GitHub [page](https://github.com/apache/cloudstack-www/blob/master/source/users.markdown) or write your concerns to the mail-list **users@cloudstack.apache.org**.
 
 * [ActOnMagic](http://www.actonmagic.com)
 * [Appcore](http://www.appcore.com)
@@ -55,6 +55,7 @@
 * [Melbourne University](http://nectar.org.au)
 * [Miriadis](http://www.miriadis.com)
 * [Neobitti](http://neobitti.fi)
+* [NetPoint](https://netpoint-dc.com/)
 * [Openminds](http://www.openminds.be)
 * [Overweb srl](http://stacksquare.com)
 * [Polcom](http://polcom.com.pl)