diff --git a/themes/openlp2v2/assets/css/custom.css b/themes/openlp2v2/assets/css/custom.css
index ec2169a..67c5308 100644
--- a/themes/openlp2v2/assets/css/custom.css
+++ b/themes/openlp2v2/assets/css/custom.css
@@ -7,6 +7,12 @@ Created:November 2014
 License: Creative Commons Attribution 3.0 License (https://creativecommons.org/licenses/by/3.0/)
 File Description: Place here your custom CSS styles
 */
+@media (max-width: 767px) {
+    .navbar-collapse {
+        background-color: rgba(0, 0, 0, 0.90);
+    }
+}
+
 .bg-image-1 {
     background: url("../images/worship-1.jpg") 50% 0px no-repeat;
 }
@@ -55,6 +61,11 @@ div.post-heading h1 {
     text-shadow: 1px 1px 2px #000;
 }
 
+div#feature-details div.row {
+  margin-bottom: 5px;
+  margin-top: 5px;
+}
+
 div.product-chooser div.product-chooser-item {
     padding: 11px;
     border-radius: 6px;
@@ -276,10 +287,12 @@ article blockquote p:first-child {
 }
 
 .social-links {
-    margin-left: auto;
-    margin-right: auto;
-    padding-left: 36px;
-    width: 463px;
+    text-align: center;
+}
+
+.social-links li {
+    margin: 10px;
+    width: 54px;
 }
 
 .social-links li.reddit a:hover {
diff --git a/themes/openlp2v2/templates/front_page.html b/themes/openlp2v2/templates/front_page.html
index 7997944..779761a 100644
--- a/themes/openlp2v2/templates/front_page.html
+++ b/themes/openlp2v2/templates/front_page.html
@@ -156,7 +156,7 @@
             </div>
         </div>
         <div class="section translucent-bg bg-image-1 blue">
-            <div class="container object-non-visible" data-animation-effect="fadeIn">
+            <div class="container object-non-visible" data-animation-effect="fadeIn" id="feature-details">
                 <h1 id="features"  class="text-center title">Features</h1>
                 <div class="space"></div>
                 <div class="row">
@@ -170,35 +170,7 @@
                                 <i class="fa fw fa-music"></i>
                             </div>
                         </div>
-                        <div class="media">
-                            <div class="media-body text-right">
-                                <h4 class="media-heading">Bibles</h4>
-                                <p>Import Bibles from a number of formats, or even download a few verses you need from a Bible site, display verses in varying formats, easily search verses by scripture reference (e.g. Luke 12:10-17) or by phrase.</p>
-                            </div>
-                            <div class="media-right">
-                                <i class="fa fa-fw fa-book"></i>
-                            </div>
-                        </div>
-                        <div class="media">
-                            <div class="media-body text-right">
-                                <h4 class="media-heading">Presentations</h4>
-                                <p>Integration with PowerPoint, PowerPoint Viewer and LibreOffice Impress on Windows and LibreOffice Impress on Linux/FreeBSD means that you can import your presentations into OpenLP and control them via OpenLP.</p>
-                            </div>
-                            <div class="media-right">
-                                <i class="fa fa-desktop"></i>
-                            </div>
-                        </div>
-                        <div class="media">
-                            <div class="media-body text-right">
-                                <h4 class="media-heading">Pictures</h4>
-                                <p>Import pictures into OpenLP and organise them into folders. Create slide-shows by simply selecting multiple songs and drag-and-dropping the selection into the service, with auto-forwarding.</p>
-                            </div>
-                            <div class="media-right">
-                                <i class="fa fa-picture-o"></i>
-                            </div>
-                        </div>
                     </div>
-                    <div class="space visible-xs"></div>
                     <div class="col-sm-6">
                         <div class="media">
                             <div class="media-left">
@@ -209,6 +181,21 @@
                                 <p>Integration with VLC means that you can display almost any video file and play almost any audio file in OpenLP. Using VLC means that a wide variety of formats are supported.</p>
                             </div>
                         </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-6">
+                        <div class="media">
+                            <div class="media-body text-right">
+                                <h4 class="media-heading">Bibles</h4>
+                                <p>Import Bibles from a number of formats, or even download a few verses you need from a Bible site, display verses in varying formats, easily search verses by scripture reference (e.g. Luke 12:10-17) or by phrase.</p>
+                            </div>
+                            <div class="media-right">
+                                <i class="fa fa-fw fa-book"></i>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-6">
                         <div class="media">
                             <div class="media-left">
                                 <i class="fa fa-file-text"></i>
@@ -218,6 +205,21 @@
                                 <p>Store your liturgy, announcements, or other custom slides in OpenLP. Just like a song, but with less structure, custom slides can also contain formatting and can be set to loop.</p>
                             </div>
                         </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-6">
+                        <div class="media">
+                            <div class="media-body text-right">
+                                <h4 class="media-heading">Presentations</h4>
+                                <p>Integration with PowerPoint, PowerPoint Viewer and LibreOffice Impress on Windows and LibreOffice Impress on Linux/FreeBSD means that you can import your presentations into OpenLP and control them via OpenLP.</p>
+                            </div>
+                            <div class="media-right">
+                                <i class="fa fa-desktop"></i>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-6">
                         <div class="media">
                             <div class="media-left">
                                 <i class="fa fa-wifi"></i>
@@ -227,6 +229,21 @@
                                 <p>Control OpenLP remotely using any tablet or phone using our remote apps in the Google Play Store and Apple App Store. Search, go live, control slides, and more. Also accessible via any phone's web browser.</p>
                             </div>
                         </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-6">
+                        <div class="media">
+                            <div class="media-body text-right">
+                                <h4 class="media-heading">Pictures</h4>
+                                <p>Import pictures into OpenLP and organise them into folders. Create slide-shows by simply selecting multiple songs and drag-and-dropping the selection into the service, with auto-forwarding.</p>
+                            </div>
+                            <div class="media-right">
+                                <i class="fa fa-picture-o"></i>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-6">
                         <div class="media">
                             <div class="media-left">
                                 <i class="fa fa-play-circle"></i>
@@ -479,11 +496,7 @@
             </div>
             <div class="translucent-bg blue">
                 <div class="container">
-                    <div class="row">
-                        <div class="col-md-8 col-md-offset-2">
-                            <h1 class="text-center">Used by churches worldwide!</h1>
-                        </div>
-                    </div>
+                    <h1 class="text-center">Used by churches worldwide!</h1>
                 </div>
             </div>
         </div>