diff --git a/app/views/communities/_participant.html.erb b/app/views/communities/_participant.html.erb
new file mode 100644
index 000000000..5e4f02900
--- /dev/null
+++ b/app/views/communities/_participant.html.erb
@@ -0,0 +1,22 @@
+<div class="comment-body">
+  <div class="comment-info">
+
+    <%= avatar_image( participant, seed: participant.id, size: 32, class: 'author-photo') %>
+
+    <div class="comment-info">
+
+      <span class="user-name">
+        <%= link_to participant.name, user_path(participant)%>
+      </span>
+
+      <% if is_author?(@community, participant) %>
+        &nbsp;&bull;&nbsp;
+        <span class="label round is-author">
+            <%= t("comments.comment.author") %>
+        </span>
+      <% end %>
+
+    </div>
+
+  </div>
+</div>
diff --git a/app/views/communities/_participants.html.erb b/app/views/communities/_participants.html.erb
index 931ebf105..a153ec624 100644
--- a/app/views/communities/_participants.html.erb
+++ b/app/views/communities/_participants.html.erb
@@ -14,28 +14,7 @@
   </ul>
 
   <% @participants.each do |participant| %>
-    <div class="comment-body">
-      <div class="comment-info">
-
-        <%= avatar_image( participant, seed: participant.id, size: 32, class: 'author-photo') %>
-
-        <div class="comment-info">
-
-          <span class="user-name">
-            <%= link_to participant.name, user_path(participant)%>
-          </span>
-
-          <% if is_author?(@community, participant) %>
-            &nbsp;&bull;&nbsp;
-            <span class="label round is-author">
-                <%= t("comments.comment.author") %>
-            </span>
-          <% end %>
-
-        </div>
-
-      </div>
-    </div>
+    <%= render 'participant', participant: participant %>
   <% end %>
 
 </div>
diff --git a/app/views/topics/_informative_text.html.erb b/app/views/topics/_informative_text.html.erb
new file mode 100644
index 000000000..aeb5ad773
--- /dev/null
+++ b/app/views/topics/_informative_text.html.erb
@@ -0,0 +1,11 @@
+<h3><%= t("community.show.create_first_community_topic.first_theme") %></h3>
+
+<% if user_signed_in? %>
+  <%= t("community.show.create_first_community_topic.first_theme_not_logged_in") %>
+<% else %>
+  <div class="callout primary">
+    <%= t("community.show.create_first_community_topic.sub_first_theme",
+          link: link_to(t("community.show.create_first_community_topic.sign_link",
+          org_name: setting['org_name']), new_user_session_path)).html_safe %>
+  </div>
+<% end %>
diff --git a/app/views/topics/_topic.html.erb b/app/views/topics/_topic.html.erb
new file mode 100644
index 000000000..fe225d501
--- /dev/null
+++ b/app/views/topics/_topic.html.erb
@@ -0,0 +1,25 @@
+<div id="<%= dom_id(topic) %>" class="panel column">
+  
+  <div class="small-8 column">
+
+    <h3><%= link_to topic.title, community_topic_path(@community, topic) %></h3>
+
+    <p class="topic-info">
+      <span class="icon-comments"></span>&nbsp;
+      <%= link_to t("community.show.topic.comments", count: topic.comments_count), community_topic_path(@community, topic, anchor: "comments") %>
+      <span class="bullet">&nbsp;&bull;&nbsp;</span>
+      <%= I18n.l topic.created_at.to_date %>
+      <span class="bullet">&nbsp;&bull;&nbsp;</span>
+      <%= topic.author.name %>
+    </p>
+
+  </div>
+
+  <div class="small-4 column text-right">
+    <% if topic.author == current_user %>
+      <%= link_to t("community.show.topic.edit_button"), edit_community_topic_path(@community.id, topic), class: 'button small hollow' %>
+      <%= link_to t("community.show.topic.destroy_button"), community_topic_path(@community.id, topic), method: :delete, class: 'button hollow alert small' %>
+    <% end %>
+  </div>
+
+</div>
diff --git a/app/views/topics/_topics.html.erb b/app/views/topics/_topics.html.erb
index b5080a61f..42fa4f319 100644
--- a/app/views/topics/_topics.html.erb
+++ b/app/views/topics/_topics.html.erb
@@ -1,49 +1,13 @@
 <% 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 column">
-      <div class="small-8 column">
-
-        <h3><%= link_to topic.title, community_topic_path(@community, topic) %></h3>
-
-        <p class="topic-info">
-          <span class="icon-comments"></span>&nbsp;
-          <%= link_to t("community.show.topic.comments", count: topic.comments_count), community_topic_path(@community, topic, anchor: "comments") %>
-          <span class="bullet">&nbsp;&bull;&nbsp;</span>
-          <%= I18n.l topic.created_at.to_date %>
-          <span class="bullet">&nbsp;&bull;&nbsp;</span>
-          <%= topic.author.name %>
-        </p>
-
-      </div>
-
-      <div class="small-4 column text-right">
-        <% if topic.author == current_user %>
-          <%= link_to t("community.show.topic.edit_button"), edit_community_topic_path(@community.id, topic), class: 'button small hollow' %>
-          <%= link_to t("community.show.topic.destroy_button"), community_topic_path(@community.id, topic), method: :delete, class: 'button hollow alert small' %>
-        <% end %>
-      </div>
-
-    </div>
-
-  <% end %>
-
 <% else %>
-  <h3><%= t("community.show.create_first_community_topic.first_theme") %></h3>
-  <% if user_signed_in? %>
-    <%= t("community.show.create_first_community_topic.first_theme_not_logged_in") %>
-  <% else %>
-    <div class="callout primary">
-      <%= t("community.show.create_first_community_topic.sub_first_theme",
-            link: link_to(t("community.show.create_first_community_topic.sign_link",
-            org_name: setting['org_name']), new_user_session_path)).html_safe %>
-    </div>
-  <% end %>
+  <%= render 'topics/informative_text', topics: topics %>
+<% end %>
+
+<% topics.each do |topic| %>
+  <%= render 'topics/topic', topic: topic %>
 <% end %>