diff --git a/www/css/app.css b/www/css/app.css
index f9506b72..695faef2 100644
--- a/www/css/app.css
+++ b/www/css/app.css
@@ -52,4 +52,16 @@
     max-width: 80%;
     margin-left: auto;
     margin-right: auto;
+}
+
+.nopadding {
+    padding-right: 1px !important;
+    padding-left: 1px !important;
+}
+
+#searchingForTitles .floating {
+    position: relative;
+    z-index: 10;
+    top: 20px;
+    height: 0px; 
 }
\ No newline at end of file
diff --git a/www/index.html b/www/index.html
index 5218a5d7..fed96ee0 100644
--- a/www/index.html
+++ b/www/index.html
@@ -66,19 +66,24 @@
 
 
                 <div class="container">
-                <form id="formTitleSearch" class="form-inline">
-                    <div class="input-group">
-                        <input type="text" id="prefix" placeholder="Search Wikipedia..." class="form-control" />
-                        <span class="input-group-btn">
-                            <a class="btn btn-default" id="searchTitles" href="#"><span class="glyphicon glyphicon-search"></span></a>
-                        </span>                
+                <form id="formTitleSearch">
+                    <div class="row">
+                        <span class="nopadding col-md-offset-1 col-sm-offset-1 col-md-8 col-sm-8 col-xs-7">
+                            <span class="input-group">
+                                <input type="text" id="prefix" placeholder="Search Wikipedia..." class="form-control" />
+                                <span class="input-group-btn">
+                                    <a class="btn btn-default" id="searchTitles" href="#"><span class="glyphicon glyphicon-search"></span></a>
+                                </span>
+                            </span>
+                        </span>
+                        <span class="nopadding col-md-2 col-sm-2 col-xs-5">
+                            <span class="btn-group btn-group-xs">
+                                <a class="btn btn-default btn-xs" id="btnArticlesNearby" href="#"><span class="glyphicon glyphicon-screenshot"></span><small><br/>Nearby</small></a>
+                                <a class="btn btn-default btn-xs" id="btnRandomArticle" href="#"><span class="glyphicon glyphicon-random"></span><small><br/>Random</small></a>
+                            </span>
+                        </span>
                     </div>
-                    <div id="articlesNearbyExpertOptions" style="display: none;">
-                        Latitude/Longitude/MaxDistance:
-                        <input type="text" id="latitude" size="8" /> <input type="text" id="longitude" size="8" /> <input type="text" id="maxDistance" size="8" /><br/>
-                    </div>
-                    or <a href="#" id="btnArticlesNearby">Find articles around me</a> (toggle <a href="#" id="btnToggleArticlesNearbyExpertMode">expert mode</a>) or <a href="#" id="btnRandomArticle">Go to a random article</a><br/>
-                    <div id="searchingForTitles" style="position: relative; z-index: 10; top: 20px; height: 0px; display: none;">
+                    <div id="searchingForTitles" class="floating" style="display: none;">
                         <img src="img/spinner.gif" alt="Please wait..." />
                     </div>
                 </form>
diff --git a/www/js/app.js b/www/js/app.js
index e8d596ae..bfc642fb 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -75,14 +75,6 @@ define(function(require) {
             $('#navbarToggle').click();
         }
     });
-    $("#btnToggleArticlesNearbyExpertMode").on("click", function(e) {
-        if ($('#articlesNearbyExpertOptions').is(":visible")) {
-            $("#articlesNearbyExpertOptions").hide();
-        }
-        else {
-            $("#articlesNearbyExpertOptions").show();
-        }
-    });
     $("#btnRandomArticle").on("click", function(e) {
         goToRandomArticle();
         $("#welcomeText").hide();