diff --git a/colab/search/templates/search/includes/search_filters.html b/colab/search/templates/search/includes/search_filters.html
index 250ede2..0262718 100644
--- a/colab/search/templates/search/includes/search_filters.html
+++ b/colab/search/templates/search/includes/search_filters.html
@@ -91,89 +91,97 @@
   <br /><br /><hr />
 {% endif %}
 
-<h4>{% trans "Sort by" %}</h4>
-<ul class="unstyled-list">
-  {% for option, dict_order in order_data.items %}
-    <li>
-      <span class="glyphicon glyphicon-chevron-right"></span>
-      <a href="{% append_to_get order=option p=1 %}">
-        {% ifequal request.GET.order option %}
-          <strong>{{ dict_order.name }}</strong>
-        {% else %}
-          {{ dict_order.name }}
-        {% endifequal %}
-      </a>
-    </li>
-  {% endfor %}
-</ul>
+<div class="row">
+
+  <div class="col-md-3">
+    <h4>{% trans "Sort by" %}</h4>
+    <ul class="unstyled-list">
+      {% for option, dict_order in order_data.items %}
+        <li>
+          <span class="glyphicon glyphicon-chevron-right"></span>
+          <a href="{% append_to_get order=option p=1 %}">
+            {% ifequal request.GET.order option %}
+              <strong>{{ dict_order.name }}</strong>
+            {% else %}
+              {{ dict_order.name }}
+            {% endifequal %}
+          </a>
+        </li>
+      {% endfor %}
+    </ul>
+  </div>
 
 {% if not request.GET.type %}
-  <h4>{% trans "Types" %}</h4>
+  <div class="col-md-6">
+    <h4>{% trans "Types" %}</h4>
 
-  <ul class="unstyled-list">
+    <ul class="unstyled-list">
 
-    <li>
-      <span class="glyphicon glyphicon-envelope"></span>
-      <a href="{% append_to_get type='thread' %}">{% trans "Discussion" %}</a>
-    </li>
-  </ul>
+      <li>
+        <span class="glyphicon glyphicon-envelope"></span>
+        <a href="{% append_to_get type='thread' %}">{% trans "Discussion" %}</a>
+      </li>
+    </ul>
+  </div>
 {% endif %}
-<hr />
 
-<!-- Desktop since and date filters -->
-<form role="form" class="hidden-sm hidden-xs">
-  {% for name, value in request.GET.items %}
-    {% if value and not name == "since" and not name == "until" %}
-      <input type="hidden" name="{{ name }}" value="{{ value }}" />
-    {% endif %}
-  {% endfor %}
+  <div class="col-md-3">
+    <!-- Desktop since and date filters -->
+    <form role="form" class="hidden-sm hidden-xs">
+      {% for name, value in request.GET.items %}
+        {% if value and not name == "since" and not name == "until" %}
+          <input type="hidden" name="{{ name }}" value="{{ value }}" />
+        {% endif %}
+      {% endfor %}
 
-  <div class="form-group">
-    <label for="since">{% trans "Since" %}</label>
-    <div class="input-group date" id="datepicker_since">
-      <input type="text" class="form-control" placeholder="{% trans "Since" %}" name="since" value="{{ request.GET.since }}" />
-      <span class="input-group-addon">
-        <span class="glyphicon glyphicon-calendar"></span>
-      </span>
-    </div>
-  </div>
-  <div class="form-group">
-    <label for="until">{% trans "Until" %}</label>
-    <div class="input-group date" id="datepicker_until">
-      <input type="text" class="form-control" placeholder="{% trans "Until" %}" name="until" value="{{ request.GET.until }}" />
-      <span class="input-group-addon">
-        <span class="glyphicon glyphicon-calendar"></span>
-      </span>
-    </div>
-  </div>
+      <div class="form-group">
+        <label for="since">{% trans "Since" %}</label>
+        <div class="input-group date" id="datepicker_since">
+          <input type="text" class="form-control" placeholder="{% trans "Since" %}" name="since" value="{{ request.GET.since }}" />
+          <span class="input-group-addon">
+            <span class="glyphicon glyphicon-calendar"></span>
+          </span>
+        </div>
+      </div>
+      <div class="form-group">
+        <label for="until">{% trans "Until" %}</label>
+        <div class="input-group date" id="datepicker_until">
+          <input type="text" class="form-control" placeholder="{% trans "Until" %}" name="until" value="{{ request.GET.until }}" />
+          <span class="input-group-addon">
+            <span class="glyphicon glyphicon-calendar"></span>
+          </span>
+        </div>
+      </div>
 
-  <p class="text-right">
-    <button type="submit" class="btn btn-default">
-      <span class="glyphicon glyphicon-filter"></span> {% trans "Filter" %}
-    </button>
-  </p>
-</form>
+      <p class="text-right">
+        <button type="submit" class="btn btn-default">
+          <span class="glyphicon glyphicon-filter"></span> {% trans "Filter" %}
+        </button>
+      </p>
+    </form>
 
-<!-- Mobile since and date filters -->
-<form role="form" class="hidden-md hidden-lg">
-  {% for name, value in request.GET.items %}
-    {% if value and not name == "since" and not name == "until" %}
-      <input type="hidden" name="{{ name }}" value="{{ value }}" />
-    {% endif %}
-  {% endfor %}
+    <!-- Mobile since and date filters -->
+    <form role="form" class="hidden-md hidden-lg">
+      {% for name, value in request.GET.items %}
+        {% if value and not name == "since" and not name == "until" %}
+          <input type="hidden" name="{{ name }}" value="{{ value }}" />
+        {% endif %}
+      {% endfor %}
 
-  <div class="form-group">
-    <label for="since">{% trans "Since" %}</label>
-    <input type="date" class="form-control" placeholder="{% trans "Since" %}" name="since" value="{{ request.GET.since }}" />
-  </div>
-  <div class="form-group hidden-md hidden-lg">
-    <label for="until">{% trans "Until" %}</label>
-    <input type="date" class="form-control" placeholder="{% trans "Until" %}" name="until" value="{{ request.GET.until }}" />
-  </div>
+      <div class="form-group">
+        <label for="since">{% trans "Since" %}</label>
+        <input type="date" class="form-control" placeholder="{% trans "Since" %}" name="since" value="{{ request.GET.since }}" />
+      </div>
+      <div class="form-group hidden-md hidden-lg">
+        <label for="until">{% trans "Until" %}</label>
+        <input type="date" class="form-control" placeholder="{% trans "Until" %}" name="until" value="{{ request.GET.until }}" />
+      </div>
 
-  <p class="text-right">
-    <button type="submit" class="btn btn-default">
-      <span class="glyphicon glyphicon-filter"></span> {% trans "Filter" %}
-    </button>
-  </p>
-</form>
+      <p class="text-right">
+        <button type="submit" class="btn btn-default">
+          <span class="glyphicon glyphicon-filter"></span> {% trans "Filter" %}
+        </button>
+      </p>
+    </form>
+  </div>
+</div>
\ No newline at end of file
diff --git a/colab/search/templates/search/search.html b/colab/search/templates/search/search.html
index a8b28f1..55ff606 100644
--- a/colab/search/templates/search/search.html
+++ b/colab/search/templates/search/search.html
@@ -56,7 +56,6 @@ We must use STATIC_URL because we have a language composing the URL
   <hr/>
 
   <div class="row">
-
     <form class="col-xs-12 col-sm-12 hidden-md hidden-lg" action="{% url "haystack_search" %}">
       <div class="input-group">
         <input type="text" class="form-control" name="q" placeholder="{% trans "Search here" %}"
@@ -69,13 +68,16 @@ We must use STATIC_URL because we have a language composing the URL
       </div>
     </form>
     <br />
+  </div>
 
-    <div id="filters" class="hidden-xs hidden-sm col-md-2 col-lg-2">
+  <div class="row">
+    <div id="filters" class="hidden-xs hidden-sm col-md-12">
       <h3>{% trans "Filters" %}</h3>
       {% include "search/includes/search_filters.html" %}
     </div>
+  </div>
 
-    <div class="col-xs-12 col-sm-12 hidden-md hidden-lg">
+  <div class="col-xs-12 col-sm-12 hidden-md hidden-lg">
       <div class="panel-group" id="accordion">
         <div class="panel panel-default">
           <div class="panel-heading subject">
@@ -95,7 +97,8 @@ We must use STATIC_URL because we have a language composing the URL
       </div>
       <hr />
     </div>
-  
+
+  <div class="row">
     <div class="col-md-10 col-lg-10">
       <ul class="list-unstyled">
       {% for result in page.object_list  %}
@@ -158,7 +161,6 @@ We must use STATIC_URL because we have a language composing the URL
         </div>
       {% endif %}
     </div>
-
   </div>
 
 {% endblock %}
--
libgit2 0.21.2