diff --git a/app/views/debates/index.html.erb b/app/views/debates/index.html.erb
index 5e7fafe0e..b910a0c0c 100644
--- a/app/views/debates/index.html.erb
+++ b/app/views/debates/index.html.erb
@@ -5,9 +5,9 @@
 <% end %>
 
 <section role="main">
-
   <div class="wrap row">
     <div id="debates" class="debates-list small-12 medium-9 column">
+
       <div class="filters">
         <div class="small-12 medium-7 left">
           <% if @search_terms %>
@@ -22,25 +22,32 @@
             </h2>
           <% end %>
         </div>
+
         <% if @tag_filter || @search_terms %>
-          <div class="small-12 medium-5 margin-top inline-block debates-order">
+          <div class="small-12 inline-block medium-5 margin-top inline-block debates-order">
             <h6 class="inline-block">
               <%= t("debates.index.select_order") %>
             </h6>
+            <%= render 'shared/order_selector', i18n_namespace: "debates.index" %>
+          </div>
         <% else %>
           <div class="small-12 inline-block">
             <h2 class="inline-block">
               <%= t("debates.index.select_order_long") %>
             </h2>
+            <%= render 'shared/order_selector', i18n_namespace: "debates.index" %>
+          </div>
         <% end %>
-        <%= render 'shared/order_selector', i18n_namespace: "debates.index" %>
+
+        <div class="show-for-small-only">
+          <%= link_to t("debates.index.start_debate"), new_debate_path, class: 'button radius expand' %>
+        </div>
+
+        <%= render @debates %>
+        <%= paginate @debates %>
       </div>
-      <div class="show-for-small-only">
-        <%= link_to t("debates.index.start_debate"), new_debate_path, class: 'button radius expand' %>
-      </div>
-      <%= render @debates %>
-      <%= paginate @debates %>
     </div>
+
     <div class="small-12 medium-3 column">
       <aside class="sidebar" role="complementary">
         <%= link_to t("debates.index.start_debate"), new_debate_path, class: 'button radius expand' %>
diff --git a/app/views/proposals/index.html.erb b/app/views/proposals/index.html.erb
index e0deb7ac9..788e1ce95 100644
--- a/app/views/proposals/index.html.erb
+++ b/app/views/proposals/index.html.erb
@@ -5,42 +5,49 @@
 <% end %>
 
 <section role="main">
-
   <div class="wrap row">
     <div id="proposals" class="Proposals-list small-12 medium-9 column">
+
       <div class="filters">
         <div class="small-12 medium-7 column">
           <% if @search_terms %>
-              <h2 class="margin-top">
-                <%= page_entries_info @proposals %>
-                <%= t("proposals.index.search_results", count: @proposals.size, search_term: @search_terms) %>
-              </h2>
+            <h2 class="margin-top">
+              <%= page_entries_info @proposals %>
+              <%= t("proposals.index.search_results", count: @proposals.size, search_term: @search_terms) %>
+            </h2>
           <% elsif @tag_filter %>
-              <h2 class="margin-top">
-                <%= page_entries_info @proposals %>
-                <%= t("proposals.index.filter_topic", count: @proposals.size, topic: @tag_filter) %>
-              </h2>
+            <h2 class="margin-top">
+              <%= page_entries_info @proposals %>
+              <%= t("proposals.index.filter_topic", count: @proposals.size, topic: @tag_filter) %>
+            </h2>
           <% end %>
         </div>
+
         <% if @tag_filter || @search_terms %>
           <div class="small-12 medium-5 margin-top inline-block proposals-order">
             <h6 class="inline-block">
               <%= t("proposals.index.select_order") %>
             </h6>
+            <%= render 'shared/order_selector', i18n_namespace: "proposals.index" %>
+          </div>
         <% else %>
           <div class="small-12 column margin-top inline-block">
-          <h2 class="inline-block">
-            <%= t("proposals.index.select_order_long") %>
-          </h2>
+            <h2 class="inline-block">
+              <%= t("proposals.index.select_order_long") %>
+            </h2>
+            <%= render 'shared/order_selector', i18n_namespace: "proposals.index" %>
+          </div>
         <% end %>
-        <%= render 'shared/order_selector', i18n_namespace: "proposals.index" %>
+
+        <div class="show-for-small-only">
+          <%= link_to t("proposals.index.start_proposal"), new_proposal_path, class: 'button radius expand' %>
+        </div>
+
+        <%= render @proposals %>
+        <%= paginate @proposals %>
       </div>
-      <div class="show-for-small-only">
-        <%= link_to t("proposals.index.start_proposal"), new_proposal_path, class: 'button radius expand' %>
-      </div>
-      <%= render @proposals %>
-      <%= paginate @proposals %>
     </div>
+
     <div class="small-12 medium-3 column">
       <aside class="sidebar" role="complementary">
         <%= link_to t("proposals.index.start_proposal"), new_proposal_path, class: 'button radius expand' %>