diff --git a/searchform.php b/searchform.php
index a12346b..2d210cf 100644
--- a/searchform.php
+++ b/searchform.php
@@ -1,9 +1,19 @@
-<form class="search-form" itemprop="potentialAction" itemscope itemtype="http://schema.org/SearchAction" class="form mt-5 mt-md-0 mb-5 text-right pr-0 w-100" method="get" action="<?php echo home_url(); ?>" role="search">
+<form class="search-form<?php
+if ( is_search() ){
+  echo ' pl-3 pr-3 ';
+}
+?>" itemprop="potentialAction" itemscope itemtype="http://schema.org/SearchAction" class="form mt-5 mt-md-0 mb-5 text-right pr-0 w-100" method="get" action="<?php echo home_url(); ?>" role="search">
   <meta itemprop="target" content="https://botwiki.org/?s={search_term_string}"/>
-  <input required pattern="\s*(\S\s*){2,}" title="What would you like to search for?" itemprop="query-input" id="search-input" class="form-control mt-4 mb-4 mr-sm-2" type="search" name="s" placeholder="<?php _e( 'Search...', 'botwiki' ); ?>" aria-label="Search" value="<?php echo get_search_query(); ?>">
-  <div id="search-filters" class="container mt-3 pl-0 pr-0 text-left<?php if ( !is_search() ) { echo ' slide-up-hidden'; } ?>">
+  <div class="container mt-3 pl-0 pr-0 text-left">
     <div class="row w-100 pl-1 pr-1">
-      <div class="col-sm-12 mt-2 pl-1">
+      <div class="col-sm-12 mt-2 pl-0 pr-0">
+        <input required pattern="\s*(\S\s*){2,}" title="What would you like to search for?" itemprop="query-input" id="search-input" class="form-control mt-3 mb-3 mr-sm-2" type="search" name="s" placeholder="<?php _e( 'Search...', 'botwiki' ); ?>" aria-label="Search" value="<?php echo get_search_query(); ?>">
+      </div>
+    </div>
+  </div>  
+  <div id="search-filters" class="container mt-1 pl-0 pr-0 text-left<?php if ( !is_search() ) { echo ' slide-up-hidden'; } ?>">
+    <div class="row w-100 pl-1 pr-1">
+      <div class="col-sm-12 mt-2 pl-1 pr-1">
         <div class="form-check form-check-inline d-xs-block">
           <input class="form-check-input" type="radio" id="search-filters-bots" name="search-filters-options[]" value="bots"<?php if ( !empty($_GET['search-filters-options']) && in_array('bots', $_GET['search-filters-options'] ) ){ echo ' checked'; } ?>>
           <label class="form-check-label" for="search-filters-bots">Bots</label>
@@ -21,7 +31,7 @@
           <label class="form-check-label" for="search-filters-everything">Everything</label>
         </div>
       </div>
-      <div class="col-sm-12 mt-4 pl-1 pr-0">
+      <div class="col-sm-12 mt-4 pl-1 pr-1">
         <div class="form-row">
           <label for="bot-info-1-network">Network</label>
           <select class="form-control js-select2" name="networks" placeholder="Twitter, Tumblr, Slack, …" data-minimum-input-length="0" data-clear="true" data-multiple="true" data-tags="false">
@@ -38,7 +48,7 @@
           </select>
         </div>
       </div>
-      <div class="col-sm-12 mt-4 pl-1 pr-0">
+      <div class="col-sm-12 mt-4 pl-1 pr-1">
         <div class="form-row">        
           <label><input id="search-filter-opensource" name="opensource" type="checkbox" value="true" <?php
             if ( isset( $_GET['opensource'] ) ){
@@ -46,10 +56,10 @@
             } ?>> Open-source</label>
         </div>
       </div>
-    </div>
-    <div class="col-sm-12 mt-4 pl-1 pr-0">
-      <div class="text-left">
-        <button class="btn btn-outline-success my-2 my-sm-0" type="submit" role="button">Search</button>
+      <div class="col-sm-12 mt-4 pl-1 pr-1">
+        <div class="text-left">
+          <button class="btn btn-outline-success my-2 my-sm-0 mx-n1" type="submit" role="button">Search</button>
+        </div>
       </div>
     </div>
   </div>