diff --git a/app/views/communities/show.html.erb b/app/views/communities/show.html.erb
index 5485cf371..d8b495855 100644
--- a/app/views/communities/show.html.erb
+++ b/app/views/communities/show.html.erb
@@ -8,19 +8,20 @@
       </div>
     </div>
   </div>
-</div>
 
-<div class="row">
-  <div class="small-12 medium-9 column">
-    <div id="topics">
-      <%= render "topics/topics", topics: @topics %>
+  <div class="row">
+    <div class="small-12 medium-9 column">
+      <div id="topics" class="topics-list">
+        <%= render "topics/topics", topics: @topics %>
+      </div>
+      <%= paginate @topics %>
     </div>
-    <%= paginate @topics %>
-  </div>
 
-  <div class="small-12 medium-3 column">
-    Participa
-    <%= link_to t("topic.new"), new_community_topic_path(@community.id), class: 'button expanded' %>
+    <aside class="small-12 medium-3 column">
+      <div class="sidebar-divider"></div>
+      <h2><%= t("community.sidebar.topic.title") %></h2>
+      <%= link_to t("community.sidebar.topic.new_topic"), new_community_topic_path(@community.id), class: 'button expanded' %>
+    </aside>
   </div>
 </div>
 
diff --git a/app/views/topics/_topics.html.erb b/app/views/topics/_topics.html.erb
index 3df284461..96a7fbdd8 100644
--- a/app/views/topics/_topics.html.erb
+++ b/app/views/topics/_topics.html.erb
@@ -1,9 +1,10 @@
-<div class="order">
-  Ordenar por:
-  <%= render 'shared/wide_order_selector', i18n_namespace: "topics" %>
-</div>
-
 <% if topics.any? %>
+  <div class="row column">
+    <div class="order">
+      <%= render 'shared/wide_order_selector', i18n_namespace: "comments" %>
+    </div>
+  </div>
+
   <% topics.each do |topic| %>
     <div id="<%= dom_id(topic) %>" class="panel">
       <div class="small-12 medium-11 column">
diff --git a/config/locales/es/community.yml b/config/locales/es/community.yml
index b0d1f8236..c82f6c83f 100644
--- a/config/locales/es/community.yml
+++ b/config/locales/es/community.yml
@@ -25,6 +25,7 @@ es:
 
     topic:
       create: Crear un tema
+
       edit_button: Editar
       form:
         topic_title: Titulo del tema
@@ -32,7 +33,8 @@ es:
         new:
           submit_button: Crear tema
         edit:
-          submit_button: Editar tema
+          submit_button: Guardar cambios
+
       show:
         community_of_the_proposal: Comunidad de la propuesta
         tab: