diff --git a/plugins/mezuro/public/javascripts/autoreload.js b/plugins/mezuro/public/javascripts/autoreload.js
index 0715091..89aeb11 100644
--- a/plugins/mezuro/public/javascripts/autoreload.js
+++ b/plugins/mezuro/public/javascripts/autoreload.js
@@ -20,4 +20,4 @@ function show_page_with_results(content){
       show_autoreload(jQuery);
     }, wait * 1000);
   }
-}
+}
\ No newline at end of file
diff --git a/plugins/mezuro/public/style.css b/plugins/mezuro/public/style.css
index 4de2797..ed1e524 100644
--- a/plugins/mezuro/public/style.css
+++ b/plugins/mezuro/public/style.css
@@ -1,3 +1,3 @@
 .link {
     cursor: pointer;
-}
+}
\ No newline at end of file
diff --git a/plugins/mezuro/views/cms/mezuro_plugin/_project_content.html.erb b/plugins/mezuro/views/cms/mezuro_plugin/_project_content.html.erb
index 33e0b6e..175bcf5 100644
--- a/plugins/mezuro/views/cms/mezuro_plugin/_project_content.html.erb
+++ b/plugins/mezuro/views/cms/mezuro_plugin/_project_content.html.erb
@@ -2,7 +2,7 @@
 
 <%
   begin
-    @project = @article.title.nil? ? nil : Kalibro::Client::ProjectClient.new.project(@article.title)
+    @project = @article.title.nil? ? nil : Kalibro::Client::ProjectClient.project(@article.title)
   rescue
     @project = nil
   end
diff --git a/plugins/mezuro/views/content_viewer/_project_result.rhtml b/plugins/mezuro/views/content_viewer/_project_result.rhtml
index 5d44274..c852653 100644
--- a/plugins/mezuro/views/content_viewer/_project_result.rhtml
+++ b/plugins/mezuro/views/content_viewer/_project_result.rhtml
@@ -1,48 +1,29 @@
-<% if ! @project_content.project.error.nil? %>
-  <h3><%= _('ERROR') %></h3>
-  <p>
-    <%= "State when error ocurred: #{@project_content.project.state}" %>
-    <br/>
-    <% error = @project_content.project.error %>
-    <%= error.message %>
-    <ul><% error.stack_trace.each do |trace| %>
-      <li><%= "#{trace.declaring_class}.#{trace.method_name}(#{trace.file_name}:#{trace.line_number})" %></li>
-    <% end %></ul>
-  </p>
-<% elsif @project_content.project.state.end_with?('ING') %>
-  
-  <%= _("Loading results for %s ...") % @project_content.project.name %>
+<% @project_result = content.project_result %>
 
-<% elsif @project_content.project.state == 'READY' %>
- 
-  <h3><%= _('LAST RESULT') %></h3>
-  <% @project_result = @project_content.project_result %>
+<h3><%= _('LAST RESULT') %></h3>
 
-  <table id="project_result_info">
-    <tr>
-      <td><%= _('Date') %></td>
-      <td><%= @project_result.date %></td>
-    </tr>
-    <tr>
-      <td><%= _('Load time') %></td>
-      <td><%= @project_result.formatted_load_time %></td>
-    </tr>
-    <tr>
-      <td><%= _('Analysis time') %></td>
-      <td><%= @project_result.formatted_analysis_time %></td>
-    </tr>
-  </table>
+<table>
+  <tr>
+    <td><%= _('Date') %></td>
+    <td><%= @project_result.date %></td>
+  </tr>
+  <tr>
+    <td><%= _('Load time') %></td>
+    <td><%= @project_result.formatted_load_time %></td>
+  </tr>
+  <tr>
+    <td><%= _('Analysis time') %></td>
+    <td><%= @project_result.formatted_analysis_time %></td>
+  </tr>
+</table>
 
-  <h5><%= _('Source tree') %></h5>
+<h4><%= _('Source tree') %></h4>
+<%= render :partial => 'content_viewer/source_tree', :locals => { :source_tree => @project_result.source_tree } %>
 
-  <%= render :partial => 'content_viewer/source_tree', :locals => { :source_tree => @project_result.source_tree } %>
+<div id='module-result' data-profile="<%= content.profile.identifier %>" data-content='<%= content.id %>'>
+  <%= render :partial => 'content_viewer/module_result', :locals => { :module_result => content.module_result(content.project.name) } %>
+</div>
 
-  <div id='module-result' data-profile="<%= @project_content.profile.identifier %>" data-project-id='<%= @project_content.id %>'>
-    <%= render :partial => 'content_viewer/module_result', :locals => { :module_result => @project_content.module_result(@project_content.project.name) } %>
-  </div>
-
-  <script type="text/javascript">
-    jQuery(results);
-  </script>
-
-<% end %>.
+<script type="text/javascript">
+  jQuery(results);
+</script>
\ No newline at end of file
diff --git a/plugins/mezuro/views/content_viewer/_source_tree.rhtml b/plugins/mezuro/views/content_viewer/_source_tree.rhtml
index 773375c..fa561cf 100644
--- a/plugins/mezuro/views/content_viewer/_source_tree.rhtml
+++ b/plugins/mezuro/views/content_viewer/_source_tree.rhtml
@@ -5,9 +5,9 @@
     <tr>
       <td width="10%">
         <img alt="+" src="/plugins/mezuro/images/plus.png" class="link"
-          id="<%= module_name %>_plus" onclick="toggle('<%= module_name %>')" style="display: none"/>
+          id="<%= module_name %>_plus" onclick="toggle('<%= module_name %>')"/>
         <img alt="-" src="/plugins/mezuro/images/minus.png" class="link"
-          id="<%= module_name %>_minus" onclick="toggle('<%= module_name %>')"/>
+          id="<%= module_name %>_minus" onclick="toggle('<%= module_name %>')" style="display: none"/>
       </td>
       <td>
         <a href="#" class="module-result-link" data-module-name="<%= module_name %>">
@@ -15,7 +15,7 @@
         </a>
       </td>
     </tr> 
-    <tr id="<%= module_name %>_hidden">
+    <tr id="<%= module_name %>_hidden" style="display: none">
       <td></td> 
       <td style="text-align: left">
         <% source_tree.children.each do |child| %>
diff --git a/plugins/mezuro/views/content_viewer/show_project.rhtml b/plugins/mezuro/views/content_viewer/show_project.rhtml
index 985fb9e..3d46306 100644
--- a/plugins/mezuro/views/content_viewer/show_project.rhtml
+++ b/plugins/mezuro/views/content_viewer/show_project.rhtml
@@ -1,7 +1,6 @@
-<% @project_content = @page
-   @project = @project_content.project %>
+<% @project = @page.project %>
 
-<table id="project_info">
+<table>
   <tr>
     <td><%= _('Name') %></td>
     <td><%= @project.name %></td>
@@ -30,9 +29,21 @@
 
 <br />
 
-<div id='autoreload' data-profile="<%= @project_content.profile.identifier %>" data-project-id='<%= @project_content.id %>' data-project-name='<%= @project.name %>' data-project-state='<%= @project.state %>'>
-</div> 
-  
-<script type="text/javascript">
-  jQuery(show_autoreload);
-</script>
+<% if ! @project.error.nil? %>
+  <h3><%= _('ERROR') %></h3>
+  <p>
+    <%= "State when error ocurred: #{@project.state}" %>
+    <br/>
+    <% error = @project.error %>
+    <%= error.message %>
+    <ul>
+      <% error.stack_trace.each do |trace| %>
+        <li><%= "#{trace.declaring_class}.#{trace.method_name}(#{trace.file_name}:#{trace.line_number})" %></li>
+      <% end %>
+    </ul>
+  </p>
+<% elsif @project.state.end_with?('ING') %>
+  <h3><%= _('Service is ') + @project.state.downcase + ' ' + @project.name + '...' %></h3>
+<% elsif @project.state == 'READY' %>
+  <%= render :partial => 'content_viewer/project_result', :locals => { :content => @page } %>
+<% end %>
\ No newline at end of file
--
libgit2 0.21.2