diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index 70498a70c..40cf13510 100644
--- a/app/controllers/welcome_controller.rb
+++ b/app/controllers/welcome_controller.rb
@@ -2,7 +2,7 @@ class WelcomeController < ApplicationController
   skip_authorization_check
 
   def index
-    @featured_debates = Debate.order("created_at DESC").limit(3)
+    @featured_debates = Debate.order("created_at DESC").limit(9)
     set_voted_values @featured_debates.map(&:id)
   end
 
diff --git a/app/views/debates/index.html.erb b/app/views/debates/index.html.erb
index f459b6564..3a3881b76 100644
--- a/app/views/debates/index.html.erb
+++ b/app/views/debates/index.html.erb
@@ -4,7 +4,7 @@
       <%= render @debates %>
     </div>
     <div class="small-12 medium-3 column">
-      <aside role="complementary">
+      <aside class="sidebar" role="complementary">
         <%= link_to t("debates.index.create_debate"), new_debate_path, class: 'button radius expand' %>
         <%= render "shared/tag_cloud" %>
       </aside>
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index b73276091..434499859 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -1,13 +1,5 @@
 <section role="main">
-  <div id="featured-debates" class="row">
+  <div id="featured-debates" class="featured-debates row">
     <%= render partial: "featured_debate", collection: @featured_debates %>
   </div>
-  <div class="row">
-    <div class="small-12 medium-3 column">
-      <aside role="complementary">
-        <%= link_to t("layouts.header.see_all_debates"), debates_path, class: 'button radius expand' %>
-        <%= render "shared/tag_cloud" %>
-      </aside>
-    </div>
-  </div>
 </section>
\ No newline at end of file