diff --git a/plugins/mezuro/lib/kalibro/entities/module_node.rb b/plugins/mezuro/lib/kalibro/entities/module_node.rb
index 72e4005..4ca81a6 100644
--- a/plugins/mezuro/lib/kalibro/entities/module_node.rb
+++ b/plugins/mezuro/lib/kalibro/entities/module_node.rb
@@ -6,6 +6,14 @@ class Kalibro::Entities::ModuleNode < Kalibro::Entities::Entity
     @module = to_entity(value, Kalibro::Entities::Module)
   end
 
+  def module_name
+    @module.name
+  end
+
+  def granularity
+    @module.granularity
+  end
+
   def child=(value)
     @child = to_entity_array(value, Kalibro::Entities::ModuleNode)
   end
@@ -18,30 +26,4 @@ class Kalibro::Entities::ModuleNode < Kalibro::Entities::Entity
     @child = children
   end
 
-  def print
-    cell = "<td>#{@module.name} (#{@module.granularity})</td>"
-    return "<table><tr><td width=\"1\"></td>" + cell + "</tr></table>" if @child.nil?
-
-    id = @module.name
-    "<table>" +
-      "<tr>" +
-        "<td width=\"10%\">" +
-          "<img id=\"#{id}_plus\" onclick=\"toogle('#{id}')\"" +
-            "alt=\"+\" src=\"/plugins/mezuro/images/plus.png\" class=\"link\"" +
-            "style=\"display: none\"/>" +
-          "<img id=\"#{id}_minus\" onclick=\"toogle('#{id}')\"" +
-            "alt=\"-\" src=\"/plugins/mezuro/images/minus.png\" class=\"link\"" +
-            "/>" +
-        "</td>" +
-        cell +
-      "</tr>" +
-      "<tr id=\"#{id}_hidden\">" +
-        "<td></td>" +
-        "<td style=\"text-align: left\">" +
-          @child.collect { |child| child.print }.to_s +
-        "</td>" +
-      "</tr>" +
-    "</table>"
-  end
-
-end
\ No newline at end of file
+end
diff --git a/plugins/mezuro/views/content_viewer/_source_tree.rhtml b/plugins/mezuro/views/content_viewer/_source_tree.rhtml
new file mode 100644
index 0000000..e62f146
--- /dev/null
+++ b/plugins/mezuro/views/content_viewer/_source_tree.rhtml
@@ -0,0 +1,30 @@
+<% if source_tree.children && !source_tree.children.empty? %>
+  <table> 
+    <tr> 
+      <td width='10%'> 
+        <img id='<%= source_tree.module_name %>_plus' onclick="toogle('<%= source_tree.module_name %>')" 
+        alt='+' src='/plugins/mezuro/images/plus.png' class='link' 
+        style='display: none'/> 
+        <img id='<%= source_tree.module_name %>_minus' onclick="toogle('<%= source_tree.module_name %>')"
+        alt='-' src='/plugins/mezuro/images/minus.png' class='link' 
+        /> 
+      </td> 
+      <td><%= source_tree.module_name %> (<%= source_tree.granularity %>)</td>
+    </tr> 
+    <tr id='<%= source_tree.module_name %>_hidden'> 
+      <td></td> 
+      <td style='text-align: left'> 
+        <% source_tree.children.each do |child| %>
+          <%= render :partial => 'source_tree', :locals => { :source_tree => child } %>
+        <% end %>
+      </td> 
+    </tr> 
+  </table>
+<% else %>
+  <table>
+    <tr>
+      <td width='1'></td>
+      <td><%= source_tree.module_name %> (<%= source_tree.granularity %>)</td>
+    </tr>
+  </table>
+<% end %>
diff --git a/plugins/mezuro/views/content_viewer/show_project.rhtml b/plugins/mezuro/views/content_viewer/show_project.rhtml
index 8a5f53f..74b20f9 100644
--- a/plugins/mezuro/views/content_viewer/show_project.rhtml
+++ b/plugins/mezuro/views/content_viewer/show_project.rhtml
@@ -67,7 +67,7 @@
     </tr>
   </table>
   <h5><%= _('Source tree') %></h5>
-  <%= @project_result.source_tree.print %>
+  <%= render :partial => 'source_tree', :locals => { :source_tree => @project_result.source_tree } %>
 
   <% @module_result = @page.module_result(@project.name) %>
 
--
libgit2 0.21.2