diff --git a/community/contribute.html b/community/contribute.html
index d82b651..7c3034d 100644
--- a/community/contribute.html
+++ b/community/contribute.html
@@ -52,170 +52,91 @@
         <section id="contribute" class="page-section">
             <h1 class="first">Contribute to Apache Ignite</h1>
             <p>
-                Before you start working on Apache Ignite, you should sign up to the
+                Before you get involved in Apache Ignite development, you need to sign up to the
                 <a href="mailto:dev@ignite.apache.org">dev mailing list</a> and say "Hello" to everyone in
-                the community. We have a very friendly group and intend to make joining the project as easy as possible.
+                the community. Tell us a much as you can about your areas of expertise mentioning how
+                exactly you would like to contribute. We are a friendly and inclusive community and will try to
+                simplify your "onboarding" considering your strengths or areas of interest.
+
+                Also, share your JIRA ID in the same email
+                (<a href="https://issues.apache.org/jira/projects/IGNITE"target="_blank">create a new one</a>
+                if you don't have an ASF JIRA account yet). One of our community members will add you to
+                the contributors' list and you will be able to go ahead and book Ignite tasks you'd like to work on.
+                </li>
             </p>
             <p>
-                Note, you need to subscribe to the dev list, before sending emails to it. To subscribe, send an empty email
-                to <a href="mailto:dev-subscribe@ignite.apache.org?subject=Subscribe"><nobr>dev-subscribe@ignite.apache.org</nobr></a> and follow
-                simple instructions in the reply.
+                Again, a small formality, you need to subscribe to the dev list before sending emails to it. To
+                subscribe, send an empty email to <a
+                    href="mailto:dev-subscribe@ignite.apache.org?subject=Subscribe"><nobr>dev-subscribe@ignite.apache.org</nobr></a>
+                and follow simple instructions in the reply.
             </p>
-            <div class="page-heading">Ignite Jira:</div>
             <p>
-                You should also sign up to <a href="https://issues.apache.org/jira/browse/IGNITE">Ignite Jira</a> and
-                browse through open tickets.
+                Finally, check <a href="https://cwiki.apache.org/confluence/display/IGNITE/How+to+Collaborate" target="_blank">
+                How to Collaborate</a> page for more details on various communication channels used by the community
+                members. Even though most of the discussions take place on the dev list, we hang out in Slack.
             </p>
-            <div class="page-heading">Development Process:</div>
+            <div class="page-heading">Contribution Process</div>
             <p>
-                Before you start contributing, it helps to familiarize yourself with
-                <a href="https://cwiki.apache.org/confluence/display/IGNITE/Development+Process">Ignite Development Process</a>.
+                Before you start contributing, spend some time to get to know our
+                <a href="https://cwiki.apache.org/confluence/display/IGNITE/How+to+Contribute" target="_blank">Contribution and
+                    Development</a> process. In short, our communication and collaboration are based on
+                <a href="http://www.apache.org/theapacheway/index.html" target="_blank">The Apache Way</a> that helps
+                us, as a group of professionals, drive the project forward in a respectful and inclusive way.
             </p>
-            <div class="page-heading">To Get Started:</div>
+
+            <div class="page-heading">Pick a Ticket</div>
+            <p>
+                Select a task of your interest and finish the first contributions! Start paving a path to the role of an
+                Apache Ignite committer! To simplify your first choice, we prepared a list of tickets of easy and
+                moderate complexity:
+            </p>
             <ul class="page-list">
                 <li>
-                    Choose any of the tickets below or if your interest.
+                    All the current
+                    <a href="https://issues.apache.org/jira/issues/?jql=project%20%3D%20IGNITE%20AND%20labels%20in%20(newbie)%20and%20status%20%3D%20OPEN" target="_blank">
+                        easy and moderate tickets</a> suited for a quick start.
                 </li>
                 <li>
-                    Send an email to the <a href="mailto:dev@ignite.apache.org">dev list</a> letting us know
-                    that you want to work on it (make sure to
-                    <a href="mailto:dev-subscribe@ignite.apache.org">subscribe</a> first).
+                    Machine Learning
+                    <a href="https://issues.apache.org/jira/browse/IGNITE-12384?jql=project%20%3D%20IGNITE%20AND%20labels%20in%20(newbie)%20and%20component%20in%20(ML)%20and%20status%20%3D%20OPEN" target="_blank">
+                        tickets for beginners</a>.
                 </li>
                 <li>
-                    Share your JIRA ID in the email so that one of the committers can add you to the contributor list and you are able to assign the ticket to yourself.
+                    Or <a href="https://issues.apache.org/jira/browse/IGNITE-12433?jql=project%20%3D%20IGNITE%20AND%20labels%20in%20(newbie)%20and%20component%20in%20(sql)%20and%20status%20%3D%20OPEN" target="_blank">
+                    SQL tasks</a> to start with.
                 </li>
                 <li>
-                    Visit our <a href="https://cwiki.apache.org/confluence/display/IGNITE/How+to+Contribute">How to Contribute</a> page for details about the project workflow and JIRA process.
+                    If you are more interested in .NET, Python, Node.JS or other programming languages different from
+                    Java then use <a
+                        href="https://issues.apache.org/jira/browse/IGNITE-12427?jql=project%20%3D%20IGNITE%20AND%20labels%20in%20(newbie)%20and%20component%20in%20(platforms)%20and%20status%20%3D%20OPEN" target="_blank">
+                    this filter</a> for the selection of the first tasks.
                 </li>
-
+                <li>
+                    Are you willing to integrate Ignite with other frameworks and technologies? Check one of
+                    <a href="https://issues.apache.org/jira/browse/IGNITE-3131?jql=project%20%3D%20IGNITE%20AND%20component%20in%20(Integrations)%20and%20status%20%3D%20OPEN"
+                    target="_blank">these tickets </a> or propose your integration.
+                </li>
+                <li>
+                    Curious in distributed data structures?
+                    <a
+                            href="https://issues.apache.org/jira/browse/IGNITE-12101?jql=project%20%3D%20IGNITE%20AND%20component%20in%20(%22data%20structures%22)%20and%20status%20%3D%20OPEN" target="_blank">
+                        Help to improve</a> existing ones or contribute a brand new.
+                </li>
             </ul>
-        </section>
+            <p>
+                Still haven't found anything gripping? Search through all the tickets in
+                <a href="https://issues.apache.org/jira/browse/IGNITE/">Ignite Jira</a>, check the latest Ignite
+                discussions on the dev list or simply email us.
+            </p>
 
-        <section id="pick-ticket" class="page-section">
-            <h2>Pick a Ticket</h2>
-            <div class="page-heading">Getting Started:</div>
+            <div class="page-heading">Become a Committer and PMC Member</div>
             <p>
-                <ul class="page-list">
-                    <li>
-                        Easy tickets to get started with Apache Ignite:
-                        <a href="https://issues.apache.org/jira/issues/?jql=project%20%3D%20IGNITE%20AND%20labels%20in%20(newbie)%20and%20status%20%3D%20OPEN">easy tickets</a>
-                    </li>
-                    <li>All other issues: <a href="https://issues.apache.org/jira/browse/IGNITE/">Ignite Jira</a></li>
-                </ul>
-            </p>
-            <div class="page-heading">Apache Ignite APIs:</div>
-            <p>
-                <li>Node JS Client, <a href="https://issues.apache.org/jira/browse/IGNITE-961">IGNITE-961</a></li>
-                <li>Python Client, <a href="https://issues.apache.org/jira/browse/IGNITE-4600">IGNITE-4600</a></li>
-                <li>R Client, <a href="https://issues.apache.org/jira/browse/IGNITE-4605">IGNITE-4605</a></li>
-            </ul>
-            </p>
-            <div class="page-heading">Integrations:</div>
-            <p>
-            <ul class="page-list">
-                <li>Apache Apex Connectors, <a href="https://issues.apache.org/jira/browse/IGNITE-3131">IGNITE-3131</a> </li>
-                <li>DynaCache Provider, <a href="https://issues.apache.org/jira/browse/IGNITE-5047">IGNITE-5047</a> </li>
-        </ul>
-            </p>
-            <div class="page-heading">Kubernetes Deployments Support:</div>
-            <p>
-                Parent Jira ticket for the Kubernetes related work: <a href="https://issues.apache.org/jira/browse/IGNITE-4159">IGNITE-4159</a>.
-            <ul class="page-list">
-                <li>Discovery for Nodes to Connect to Kubernetes From Outside, <a href="https://issues.apache.org/jira/browse/IGNITE-4161">IGNITE-4161</a></li>
-            </ul>
-            </p>
-            <div class="page-heading">Streaming:</div>
-            <p>
-                Parent Jira ticket for the streaming work: <a href="https://issues.apache.org/jira/browse/IGNITE-108">IGNITE-108</a>. 
-                <ul class="page-list">
-                    <li>Streaming from Akka, <a href="https://issues.apache.org/jira/browse/IGNITE-532">IGNITE-532</a></li>
-                    <li>Streaming from ZeroMQ, <a href="https://issues.apache.org/jira/browse/IGNITE-533">IGNITE-533</a></li>
-                    <li>Streaming from Amazon Kinesis, <a href="https://issues.apache.org/jira/browse/IGNITE-536">IGNITE-536</a></li>
-               </ul>
-            </p>
-            <div class="page-heading">Data Structures:</div>
-            <p>
-                Parent Jira ticket for the data structures work: <a href="https://issues.apache.org/jira/browse/IGNITE-641">IGNITE-641</a>. 
-                <ul class="page-list">
-                    <li>Distributed reentrant read-write lock, <a href="https://issues.apache.org/jira/browse/IGNITE-637">IGNITE-637</a></li>
-                    <li>Distributed multi-map, <a href="https://issues.apache.org/jira/browse/IGNITE-640">IGNITE-640</a></li>
-                    <li>Queue persistence, <a href="https://issues.apache.org/jira/browse/IGNITE-2389">IGNITE-2389</a></li>
-               </ul>
-            </p>
-            <div class="page-heading">Hadoop & Spark:</div>
-            <p>
-                <ul class="page-list">
-                    <li>Python API for Ignite RDD for Spark, <a href="https://issues.apache.org/jira/browse/IGNITE-949">IGNITE-949</a></li>
-               </ul>
-            </p>
-            <div class="page-heading">Ignite.NET:</div>
-            <p>
-				Getting Started guide on wiki: <a href="https://cwiki.apache.org/confluence/display/IGNITE/Ignite.NET+Development">Ignite.NET Development</a>.
-                <ul class="page-list">
-                    <li>Easy tickets to get started: <a href="https://issues.apache.org/jira/issues/?jql=project%3Dignite%20and%20status%20%3D%20Open%20AND%20labels%3D%20newbie%20AND%20summary%20~%20.Net%20AND%20assignee%20%3D%20EMPTY">starter tickets</a></li>
-					<li>ADO.NET Data Provider, <a href="https://issues.apache.org/jira/browse/IGNITE-4206">IGNITE-4206</a></li>
-					<li>NHibernate Second Level Cache, <a href="https://issues.apache.org/jira/browse/IGNITE-2658">IGNITE-2658</a></li>
-					<li>LINQ plan caching, <a href="https://issues.apache.org/jira/browse/IGNITE-2764">IGNITE-2764</a></li>
-                    <li>Distributed LINQ parallel extensions, <a href="https://issues.apache.org/jira/browse/IGNITE-4101">IGNITE-4101</a></li>
-                </ul>
-            </p>
-        </section>
-
-        <section id="ignite-dev" class="page-section">
-            <h2>Start Developing</h2>
-            <p>
-                Apache Ignite uses GIT for its VCS system. The "master" branch contains the last released version. The "sprint-N" branch contains the latest code for the Nth sprint.
-            </p>
-            <div class="page-heading">GIT checkout:</div>
-            <pre class="brush:bash">
-                # Master branch.
-                $ git clone https://gitbox.apache.org/repos/asf/ignite
-
-                # Release branch.
-                $ git clone https://gitbox.apache.org/repos/asf/ignite -b ignite-2.7.5
-            </pre>
-            <div class="page-heading">Build Project:</div>
-            <pre class="brush:bash">
-                # Build project.
-                $ mvn clean package -DskipTests
-
-                # Run Apache RAT
-                $ mvn clean validate -Pcheck-licenses
-            </pre>
-            <p>
-                See more detailed build instructions in the
-                <a href="https://github.com/apache/ignite/blob/master/DEVNOTES.txt" target="_blank" rel="noopener">DEVNOTES.txt</a> file.
-            </p>
-            <div class="page-heading">To Start Contributing:</div>
-            <ul class="page-list">
-                <li>
-                    Pick a ticket from
-                    <a href="https://issues.apache.org/jira/browse/IGNITE" target="_blank" rel="noopener">Ignite Jira</a>
-                </li>
-                <li>Follow GitHub pull-request's based contribution way that is described 
-                <a href="https://cwiki.apache.org/confluence/display/IGNITE/How+to+Contribute#HowtoContribute-1.CreateGitHubpull-request">here</a> in details.</li>
-            </ul>
-        </section>
-
-        <section id="nightly-builds" class="page-section">
-            <h2>Nightly Builds </h2>
-            <ul class="features-list">
-                <li>
-                    <a id="apache_ignite_nighly_download"
-                       href="https://cwiki.apache.org/confluence/display/IGNITE/Nightly+Builds" target="_blank" rel="noopener" onclick="ga('send', 'event', 'apache_ignite_nighly_download', 'download', 'apache_ignite_nighly_download');">Last successful build</a>
-                </li>
-            </ul>&nbsp;
-            <p>Nightly builds are not official Apache Ignite releases, have not been tested, and come with no guarantees.</p>
-        </section>
-
-        <section id="become-committer" class="page-section">
-            <h2>Become a Committer</h2>
-            <p>
-                We love contributions and gladly promote active contributors to committers and PMC members!
+                We love contributions and gladly promote active contributors to committers and PMC members! If you
+                are new to Apache Software Foundation then Ignite will be an excellent
             </p>
             <p>
                 The most important point of becoming a committer for Apache projects is active participation
-                within the community. Being an active community member means participating on mailing list
+                within the community. Being an active community member means participating in mailing list
                 discussions, helping to answer questions, being respectful towards others, and following the
                 meritocratic principles of community management.
             </p>
@@ -224,10 +145,42 @@
                 you will become eligible to join Ignite committers, and possibly Ignite PMC.
                 Candidates for new committers or PMC members are suggested by the current committers, mentors, or
                 PMC members, and then must be approved by the PMC voting process.
+                <a href="https://cwiki.apache.org/confluence/display/IGNITE/Committership+Bar+Guidance" target="_blank">
+                    This page</a> explains how and when Ignite community members decide to propose contributors to
+                the roles of committers or PMC members.
+            </p>
+        </section>
+
+        <section id="ignite-dev" class="page-section">
+            <h2>Start Coding</h2>
+            <p>
+                Apache Ignite uses GIT for its VCS system. The "master" branch contains the last released version.
+                The "ignite-{version}" branch contains the latest code for the latest or upcoming release.
+
+                Refer to the <a href="https://cwiki.apache.org/confluence/display/IGNITE/How+to+Contribute" target="_blank">Contribution and
+                Development</a> page that explains the process in detail including reviews, pull-requests, etc. --
+                everything you need to know and to do before a contribution can be accepted.
+                While below you can find quick instructions if you can't wait and want to checkout the Ignite repo,
+                explore its code and do some changes:
+            </p>
+            <div class="page-heading">GIT checkout</div>
+            <pre class="brush:bash">
+                # Master branch.
+                $ git clone https://github.com/apache/ignite.git
+            </pre>
+            <div class="page-heading">Build Project</div>
+            <pre class="brush:bash">
+                # Build project.
+                $ mvn clean install -Pall-java,all-scala,licenses -DskipTests
+            </pre>
+            <p>
+                See more detailed build instructions in the
+                <a href="https://github.com/apache/ignite/blob/master/DEVNOTES.txt" target="_blank" rel="noopener">DEVNOTES.txt</a> file.
             </p>
         </section>
     </main>
     <!--#include virtual="/includes/footer.html" -->
+</main>
 </div>
 <!--#include virtual="/includes/scripts.html" -->
 </body>
diff --git a/community/resources.html b/community/resources.html
index 5ae58a0..e0835c0 100644
--- a/community/resources.html
+++ b/community/resources.html
@@ -227,92 +227,6 @@
                         *&nbsp;&nbsp;- PMC member<br/>
                         ** - PMC chair
                     </p>
-                <!--</div>-->
-                <!--<div class="col-sm-6 col-md-4 col-xs-12" style="padding-left:0; padding-right:0">-->
-                    <!--<p><h2>Contributors</h2></p>-->
-                    <!--<table class="formatted contributors" name="Apache Ignite Community Contributors">-->
-                        <!--<thead>-->
-                        <!--<tr><th>Name</th></tr>-->
-                        <!--</thead>-->
-                        <!--<tbody>-->
-                        <!--<tr><td>Alexandre Boundnik</td></tr>-->
-                        <!--<tr><td>Alexandr Fedotov</td></tr>-->
-                        <!--<tr><td>Alexander Menshikov</td></tr>-->
-                        <!--<tr><td>Alexander Paschenko</td></tr>-->
-                        <!--<tr><td>Alexei Scherbakov</td></tr>-->
-                        <!--<tr><td>Alexey Kuznetsov</td></tr>-->
-						<!--<tr><td>Alexey Rokhin</td></tr>-->
-                        <!--<tr><td>Aleksei Zaitsev</td></tr>-->
-                        <!--<tr><td>Alexey Zinoviev</td></tr>-->
-                        <!--<tr><td>Aliaksandr Kazlou</td></tr>-->
-                        <!--<tr><td>Alper Tekinalp</td></tr>-->
-                        <!--<tr><td>Amir Akhmedov</td></tr>-->
-                        <!--<tr><td>Anand Kumar Sankaran</td></tr>-->
-                        <!--<tr><td>Andrew Mashenkov</td></tr>-->
-                        <!--<tr><td>Andrey Kornev</td></tr>-->
-                        <!--<tr><td>Andrey Kuznetsov</td></tr>-->
-                        <!--<tr><td>Anton Dmitriev</td></tr>-->
-                        <!--<tr><td>Artem Malykh</td></tr>-->
-                        <!--<tr><td>Artem Schitow</td></tr>-->
-                        <!--<tr><td>Artem Shutak</td></tr>-->
-                        <!--<tr><td>Ashwin Sharma</td></tr>-->
-                        <!--<tr><td>Biao Ma</td></tr>-->
-                        <!--<tr><td>Chandresh Pancholi</td></tr>-->
-                        <!--<tr><td>Cristian Malinescu</td></tr>-->
-                        <!--<tr><td>Dmitriy Govorukhin</td></tr>-->
-                        <!--<tr><td>Dmitriy Karachentsev</td></tr>-->
-                        <!--<tr><td>Dmitriy Ryabov</td></tr>-->
-                        <!--<tr><td>Dmitriy Shabalin</td></tr>-->
-                        <!--<tr><td>Eduard Shangareev</td></tr>-->
-                        <!--<tr><td>Eduard Yuzlikeev</td></tr>-->
-                        <!--<tr><td>Evgenii Zhuravlev</td></tr>-->
-                        <!--<tr><td>Ilya Borisov</td></tr>-->
-                        <!--<tr><td>Ilya Lantukh</td></tr>-->
-                        <!--<tr><td>Ilya Suntsov</td></tr>-->
-                        <!--<tr><td>Ivan Fedotov</td></tr>-->
-                        <!--<tr><td>Ivan Veselovsky</td></tr>-->
-                        <!--<tr><td>Jens Hoffman</td></tr>-->
-                        <!--<tr><td>John Levey</td></tr>-->
-                        <!--<tr><td>Krome Plasma</td></tr>-->
-                        <!--<tr><td>Ksenia Rybakova</td></tr>-->
-                        <!--<tr><td>Lalit Kumar Jha</td></tr>-->
-                        <!--<tr><td>Marko Jevtic</td></tr>-->
-                        <!--<tr><td>Maxim Afanasiev</td></tr>-->
-                        <!--<tr><td>Maxim Kozlov</td></tr>-->
-                        <!--<tr><td>Mikhail Khruzin</td></tr>-->
-                        <!--<tr><td>Michael Griggs</td></tr>-->
-                        <!--<tr><td>Milap Wadhwa</td></tr>-->
-                        <!--<tr><td>Nikita Amelchev</td></tr>-->
-                        <!--<tr><td>Oleg Ostanin</td></tr>-->
-                        <!--<tr><td>Patrick Peralta</td></tr>-->
-                        <!--<tr><td>Paulo Pires</td></tr>-->
-                        <!--<tr><td>Pavel Konstantinov</td></tr>-->
-                        <!--<tr><td>Pavel Kovalenko</td></tr>-->
-                        <!--<tr><td>Prachi Garg</td></tr>-->
-                        <!--<tr><td>Prabhat Ranjan</td></tr>-->
-                        <!--<tr><td>Petr Ivanov</td></tr>-->
-                        <!--<tr><td>Romain Gilles</td></tr>-->
-                        <!--<tr><td>Ryan Zhao</td></tr>-->
-                        <!--<tr><td>Sergey Kozlov</td></tr>-->
-                        <!--<tr><td>Sergey Chugunov</td></tr>-->
-                        <!--<tr><td>Sergey Kalashnikov</td></tr>-->
-                        <!--<tr><td>Sergey Sidorov</td></tr>-->
-                        <!--<tr><td>Sergey Stronchinskiy</td></tr>-->
-                        <!--<tr><td>Taras Ledkov</td></tr>-->
-                        <!--<tr><td>Turik Campbell</td></tr>-->
-                        <!--<tr><td>Tolstolulakov Nikolay</td></tr>-->
-                        <!--<tr><td>Vadim Opolski</td></tr>-->
-                        <!--<tr><td>Vasilisa Sidorova</td></tr>-->
-                        <!--<tr><td>Vasiliy Sisko</td></tr>-->
-                        <!--<tr><td>Victor Maevski</td></tr>-->
-                        <!--<tr><td>Vyacheslav Daradur</td></tr>-->
-                        <!--<tr><td>Vikrant Navalgund</td></tr>-->
-                        <!--<tr><td>YuJue Li</td></tr>-->
-                        <!--<tr><td>William Do</td></tr>-->
-                        <!--<tr><td>Wei Jiang</td></tr>-->
-                        <!--</tbody>-->
-                    <!--</table>-->
-                <!--</div>-->
             </div>
         </section>
     </main>
diff --git a/download.html b/download.html
index 3e977bf..5c8c2f0 100644
--- a/download.html
+++ b/download.html
@@ -277,7 +277,7 @@
                                         <li class="divider">
 
                                         <!--Ignite with Spark & Hadoop-->
-                                        <li role="presentation" class="submenu-header">Ignite with Spark & Hadoop</li>
+                                        <li role="presentation" class="submenu-header">Ignite with Spark</li>
                                         <li><a href="/use-cases/spark/shared-memory-layer.html" aria-label="In-Memory Store for Spark"
                                                onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'shared-memory-layer');">
                                             In-Memory Store for Spark</a>
@@ -286,14 +286,6 @@
                                                onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'sql-queries');">
                                             Faster Sql for Spark</a>
                                         </li>
-                                        <li><a href="/use-cases/hadoop/hdfs-cache.html" aria-label="IGFS as HDFS Cache"
-                                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'hdfs-cache');">
-                                            IGFS as HDFS Cache</a>
-                                        </li>
-                                        <li><a href="/use-cases/hadoop/mapreduce.html" aria-label="Faster MapReduce"
-                                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'mapreduce');">
-                                            Faster MapReduce</a>
-                                        </li>
                                     </ul>
                                 </li>
                                 <li class="dropdown" style="cursor: pointer;">
@@ -311,9 +303,6 @@
                                         <li><a href="https://apacheignite.readme.io/docs/nodejs-thin-client" target="_blank" rel="noopener">Node.js Thin Client <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
                                         <li><a href="https://apacheignite.readme.io/docs/python-thin-client" target="_blank" rel="noopener">Python Thin Client <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
                                         <li><a href="https://apacheignite.readme.io/docs/php-thin-client" target="_blank" rel="noopener">PHP Thin Client <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
-                                        <!-- <li><a href="https://apacheignite-fs.readme.io/docs" target="_blank" rel="noopener">Ignite for Hadoop/Spark <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li> -->
-                                        <!-- <li><a href="http://apacheignite-tools.readme.io/docs" target="_blank" rel="noopener">Management & Monitoring <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li> -->
-                                        <!-- <li><a href="https://apacheignite-mix.readme.io/docs" target="_blank" rel="noopener">Ignite Integrations <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li> -->
                                         <li class="divider">
                                         <li role="presentation" class="submenu-header">APIs</li>
                                         <li><a href="https://ignite.apache.org/releases/latest/javadoc/index.html" target="_blank" rel="noopener">Javadoc <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
@@ -334,6 +323,11 @@
                                 <li class="dropdown" style="cursor: pointer;">
                                     <a class="dropdown-toggle" data-toggle="dropdown">Community<span class="caret"></span></a>
                                     <ul class="dropdown-menu" role="menu">
+                                        <li role="presentation" class="submenu-header">Contribute</li>
+                                        <li><a href="/community/contribute.html">Start Contributing</a></li>
+                                        <li><a href="/community/resources.html#people">Committers and PMC</a></li>
+                                        <li class="divider"></li>
+
                                         <li role="presentation" class="submenu-header">Resources</li>
                                         <li><a href="/community/resources.html#ask">Ask a Question</a></li>
                                         <li><a href="/community/resources.html#mail-lists">Mailing Lists</a></li>
@@ -350,7 +344,7 @@
                                             <a href="https://cwiki.apache.org/confluence/display/IGNITE/Third+Party+Support+and+Employment" target="_blank" rel="noopener">
                                                 Production Support <i class="fa fa-external-link" style="padding-left:5px;"></i></a>
                                         </li>
-                                        <li><a href="/community/resources.html#people">People</a></li>
+
                                         <li class="divider"></li>
                                         <li role="presentation" class="submenu-header">Events & Groups</li>
                                         <li><a href="/events.html">Upcoming Events</a></li>
@@ -359,10 +353,6 @@
                                         <li><a href="http://www.meetup.com/Apache-Ignite-London" target="_blank" rel="noopener">Ignite London Meetup <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
                                         <li><a href="https://www.meetup.com/Moscow-Apache-Ignite-Meetup/" target="_blank" rel="noopener">Ignite Moscow Meetup <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
                                         <li><a href="https://vk.com/apacheignite" target="_blank" rel="noopener">Ignite VK Group (Russian) <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
-                                        <li class="divider"></li>
-                                        <li role="presentation" class="submenu-header">Contribute</li>
-                                        <li><a href="/community/contribute.html#contribute">Start Contributing</a></li>
-                                        <li><a href="/community/contribute.html#become-committer">Become a Committer</a></li>
                                     </ul>
                                 </li>
                                 <li class="dropdown" style="cursor: pointer;">
diff --git a/includes/header.html b/includes/header.html
index 1ad3093..3bd4099 100644
--- a/includes/header.html
+++ b/includes/header.html
@@ -197,8 +197,8 @@
                                         </li>
                                         <li class="divider">
 
-                                        <!--Ignite with Spark & Hadoop-->
-                                        <li role="presentation" class="submenu-header">Ignite with Spark & Hadoop</li>
+                                        <!--Ignite with Spark-->
+                                        <li role="presentation" class="submenu-header">Ignite with Spark</li>
                                         <li><a href="/use-cases/spark/shared-memory-layer.html"
                                                onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'shared-memory-layer');">
                                             In-Memory Store for Spark</a>
@@ -207,14 +207,6 @@
                                                onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'sql-queries');">
                                             Faster Sql for Spark</a>
                                         </li>
-                                        <li><a href="/use-cases/hadoop/hdfs-cache.html"
-                                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'hdfs-cache');">
-                                            IGFS as HDFS Cache</a>
-                                        </li>
-                                        <li><a href="/use-cases/hadoop/mapreduce.html"
-                                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'mapreduce');">
-                                            Faster MapReduce</a>
-                                        </li>
                                     </ul>
                                 </li>
                                 <li class="dropdown" style="cursor: pointer;">
@@ -232,9 +224,6 @@
                                         <li><a href="https://apacheignite.readme.io/docs/nodejs-thin-client" target="_blank" rel="noopener">Node.js Thin Client <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
                                         <li><a href="https://apacheignite.readme.io/docs/python-thin-client" target="_blank" rel="noopener">Python Thin Client <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
                                         <li><a href="https://apacheignite.readme.io/docs/php-thin-client" target="_blank" rel="noopener">PHP Thin Client <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
-                                        <!-- <li><a href="https://apacheignite-fs.readme.io/docs" target="_blank" rel="noopener">Ignite for Hadoop/Spark <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li> -->
-                                        <!-- <li><a href="http://apacheignite-tools.readme.io/docs" target="_blank" rel="noopener">Management & Monitoring <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li> -->
-                                        <!-- <li><a href="https://apacheignite-mix.readme.io/docs" target="_blank" rel="noopener">Ignite Integrations <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li> -->
                                         <li class="divider">
                                         <li role="presentation" class="submenu-header">APIs</li>
                                         <li><a href="https://ignite.apache.org/releases/latest/javadoc/index.html" target="_blank" rel="noopener">Javadoc <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
@@ -254,6 +243,11 @@
                                 <li class="dropdown" style="cursor: pointer;">
                                     <a class="dropdown-toggle" data-toggle="dropdown">Community<span class="caret"></span></a>
                                     <ul class="dropdown-menu" role="menu">
+                                        <li role="presentation" class="submenu-header">Contribute</li>
+                                        <li><a href="/community/contribute.html">Start Contributing</a></li>
+                                        <li><a href="/community/resources.html#people">Committers and PMC</a></li>
+                                        <li class="divider"></li>
+
                                         <li role="presentation" class="submenu-header">Resources</li>
                                         <li><a href="/community/resources.html#ask">Ask a Question</a></li>
                                         <li><a href="/community/resources.html#mail-lists">Mailing Lists</a></li>
@@ -271,7 +265,6 @@
                                             Production Support <i class="fa fa-external-link" style="padding-left:5px;"></i></a>
                                         </li>
 
-                                        <li><a href="/community/resources.html#people">People</a></li>
                                         <li class="divider"></li>
                                         <li role="presentation" class="submenu-header">Events & Groups</li>
                                         <li><a href="/events.html">Upcoming Events</a></li>
@@ -280,10 +273,6 @@
                                         <li><a href="http://www.meetup.com/Apache-Ignite-London" target="_blank" rel="noopener">Ignite London Meetup <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
                                         <li><a href="https://www.meetup.com/Moscow-Apache-Ignite-Meetup/" target="_blank" rel="noopener">Ignite Moscow Meetup <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
                                         <li><a href="https://vk.com/apacheignite" target="_blank" rel="noopener">Ignite VK Group (Russian) <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
-                                        <li class="divider"></li>
-                                        <li role="presentation" class="submenu-header">Contribute</li>
-                                        <li><a href="/community/contribute.html#contribute">Start Contributing</a></li>
-                                        <li><a href="/community/contribute.html#become-committer">Become a Committer</a></li>
                                     </ul>
                                 </li>
                                 <li class="dropdown" style="cursor: pointer;">