diff --git a/README.md b/README.md
index 683875aa2..c778c6bca 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # converse.js
 
-[![inVerse](https://inverse.chat/badge.svg?room=discuss@conference.conversejs.org)](https://inverse.chat/#converse/room?jid=discuss@conference.conversejs.org)
+[![XMPP Chat](https://inverse.chat/badge.svg?room=discuss@conference.conversejs.org)](https://inverse.chat/#converse/room?jid=discuss@conference.conversejs.org)
 [![Travis](https://api.travis-ci.org/jcbrand/converse.js.png?branch=master)](https://travis-ci.org/jcbrand/converse.js)
 [![Bountysource bounties](https://img.shields.io/bountysource/team/converse.js/activity.svg?maxAge=2592000)](https://www.bountysource.com/teams/converse.js/issues?tracker_ids=194169)
 [![Translation status](https://hosted.weblate.org/widgets/conversejs/-/svg-badge.svg)](https://hosted.weblate.org/engage/conversejs/?utm_source=widget)
diff --git a/css/theme.css b/css/theme.css
index 542c5ef22..c95ba5e3a 100644
--- a/css/theme.css
+++ b/css/theme.css
@@ -134,7 +134,7 @@ a:focus {
 .brand-heading {
   font-size: 2em;
   text-align: center;
-  margin-top: 3em;
+  margin-top: 2.5em;
 }
 .brand-heading-embedded {
     margin-top: 1.5em;
@@ -266,7 +266,7 @@ a:focus {
   font-size: 26px;
 }
 .banner-social-buttons {
-    padding-top: 5em;
+    padding-top: 3em;
 }
 ::-moz-selection {
   text-shadow: none;
diff --git a/index.html b/index.html
index 806103888..dd76a4488 100644
--- a/index.html
+++ b/index.html
@@ -77,9 +77,14 @@
             <div class="col-md-8 col-md-offset-2">
                 <p class="intro-text">A free and open-source XMPP chat client in your browser</p>
                 <p>Now also available in a fullscreen version.
-                Check out <a href="https://inverse.chat" target="_blank" rel="noopener">inverse.chat</a> </br>
-                Please support this project via <a href="https://www.patreon.com/jcbrand" target="_blank" rel="noopener">Patreon</a> or <a href="https://liberapay.com/jcbrand" target="_blank" rel="noopener">Liberapay</a>
+                Check out <a href="https://inverse.chat" target="_blank" rel="noopener">inverse.chat</a>
                 </p>
+
+                <p>
+                <a href="https://inverse.chat/#converse/room?jid=discuss@conference.conversejs.org"
+                   target="_blank" rel="noopener"><img src="https://inverse.chat/badge.svg?room=discuss@conference.conversejs.org"/></a>
+                </p>
+
                 <div class="page-scroll">
                     <a href="#about" class="btn btn-default btn-lg"><span class="btn-text">Learn More</span></a>
                 </div>
@@ -116,7 +121,7 @@
     <section class="features-section content-section" id="features">
         <div class="container">
             <div class="row">
-                <div class="col-lg-4">
+                <div class="col-lg-6">
                     <section>
                         <span class="feature-icon page-scroll"><a class="fa fa-globe" href="#features" title="Integration"></a></span>
                         <header>
@@ -135,7 +140,7 @@
                         </ul>
                     </section>
                 </div>
-                <div class="col-lg-4">
+                <div class="col-lg-6">
                     <section>
                         <span class="feature-icon page-scroll"><a class="fa fa-check-square-o" href="#features" title="Features"></a></span>
                     </section>
@@ -169,31 +174,6 @@
                             <li>Translated into 17 languages</li>
                         </ul>
                 </div>
-                <div class="col-lg-4">
-                    <section>
-                        <span class="feature-icon page-scroll"><a class="fa fa-video-camera" href="#features" title="Screencasts"></a></span>
-                        <header>
-                            <h2>Screencasts</h2>
-                        </header>
-                        <ul class="screencasts">
-                            <li>
-                                <a href="https://opkode.com/blog/2012/07/30/instant-messaging-for-plone-with-javascript-and-xmpp" target="_blank" rel="noopener">
-                                    In a Plone site
-                                </a>
-                            </li>
-                            <li>
-                                <a href="http://opkode.com/media/blog/2013/04/02/converse.js-xmpp-instant-messaging-with-javascript" target="_blank" rel="noopener">
-                                    Chatting with buddies from Jabber.org and Gmail
-                                </a>
-                            </li>
-                            <li>
-                                <a href="https://opkode.com/media/blog/2013/11/11/conversejs-otr-support" target="_blank" rel="noopener">
-                                    Off-the-record encryption
-                                </a>
-                            </li>
-                        </ul>
-                    </section>
-                </div>
             </div>
         </div>
     </section>
@@ -204,10 +184,11 @@
                 <div class="col-lg-8 col-lg-offset-2">
                     <h2>Contact</h2>
                     <ul class="contact">
-                        <li>Follow me on <a href="http://twitter.com/jcopkode" target="_blank" rel="noopener">Twitter</a> or chat with me via XMPP at <a href="xmpp:jc@opkode.com" class="xmpp JSnocheck" title="XMPP/Jabber">jc@opkode.com</a>.</li>
+                        <li>Follow me on <a href="http://twitter.com/jcopkode" target="_blank" rel="noopener">Twitter</a>
+                            or <a href="https://mastodon.xyz/@jcbrand" target="_blank" rel="noopener">Mastodon</a>
+                        <li>Chat with me via XMPP at <a href="xmpp:jc@opkode.com" class="xmpp JSnocheck" title="XMPP/Jabber">jc@opkode.com</a></li>
                         <li>For technical support, you can ask on <a href="http://stackoverflow.com/questions/tagged/converse.js">Stack Overflow</a>
-                            or if you have a more simple question you can ask in the Converse.js chat room:
-                            <a href="xmpp:discuss@conference.conversejs.org" class="xmpp JSnocheck" title="Converse.js chat room">discuss@conference.conversejs.org</a>.</li>
+                        <li>The Converse.js XMPP chatroom: <a href="xmpp:discuss@conference.conversejs.org" class="xmpp JSnocheck" title="Converse.js chat room">discuss@conference.conversejs.org</a>.</li>
                         <li>Please file bugs and feature requests on <a target="_blank" rel="noopener" href="https://github.com/jcbrand/converse.js/issues">Github</a>.</li>
                     </ul>
                 </div>
@@ -241,7 +222,7 @@
 
                     <p class="sponsors-text">Converse.js is a software commons; available at no cost to you or anyone else.
                        Sponsorships allow us to fund further development and improvements and are greatly appreciated.
-                       If you'd like to sponsor this project, please visit <a href="https://www.patreon.com/jcbrand" target="_blank" rel="noopener">Patreon page</a>
+                       If you'd like to sponsor this project, please visit <a href="https://www.patreon.com/jcbrand" target="_blank" rel="noopener">Patreon</a>
                        or <a href="https://liberapay.com/jcbrand" target="_blank" rel="noopener">Liberapay</a>.
                     </p>
                 </div>