diff --git a/plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb b/plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb
index cb96f86..9888679 100644
--- a/plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb
+++ b/plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb
@@ -1,5 +1,7 @@
 class MezuroPluginProfileController < ProfileController
 
+  append_view_path File.join(File.dirname(__FILE__) + '/../views')
+
   def metrics
     project_content = profile.articles.find(params[:id])
     module_name = params[:module_name]
@@ -7,8 +9,7 @@ class MezuroPluginProfileController < ProfileController
   end
 
   def autoreload
-    page_content = profile.articles.find(params[:id])
-    project_name = params[:project_name]
-    render :partial => 'content_viewer/autoreload', :locals => { :project_result => page_content.project_result(project_name) }
+    @project_content = profile.articles.find(params[:id])
+    render :partial => 'content_viewer/autoreload'
   end
 end
diff --git a/plugins/mezuro/public/javascripts/autoreload.js b/plugins/mezuro/public/javascripts/autoreload.js
index f590849..c50b039 100644
--- a/plugins/mezuro/public/javascripts/autoreload.js
+++ b/plugins/mezuro/public/javascripts/autoreload.js
@@ -5,15 +5,19 @@ function show_autoreload($){
   var project_name = $('#autoreload').attr('data-project-name');
   var endpoint = '/profile/' + profile + '/plugins/mezuro/autoreload/' + project;
 
-  show_loading_message(project_name);
+  jQuery('#autoreload').html('Loading ...'); // #FIXME
   $.get(endpoint, {project_name: project_name}, show_page_with_results);
   return false;
 }
 
-function show_loading_message(project_name) {
-  jQuery('#autoreload').html("Loading results for " + project_name + "...");
-}
-
 function show_page_with_results(content){
-  jQuery('#autoreload').html(content);
+  var done = true; // FIXME; test the content in some way
+  if (done) {
+    jQuery('#autoreload').html(content);
+  } else {
+    var wait = 10; // FIXME; how many seconds to wait?
+    setTimeout(function() {
+      show_autoreload(jQuery);
+    }, wait * 1000);
+  }
 }
diff --git a/plugins/mezuro/views/content_viewer/_autoreload.rhtml b/plugins/mezuro/views/content_viewer/_autoreload.rhtml
index 555d434..1529501 100644
--- a/plugins/mezuro/views/content_viewer/_autoreload.rhtml
+++ b/plugins/mezuro/views/content_viewer/_autoreload.rhtml
@@ -1,7 +1,7 @@
-<% if project_content.project.state == 'READY' %>
+<% if @project_content.project.state == 'READY' %>
  
   <h3><%= _('LAST RESULT') %></h3>
-  <% @project_result = project_content.project_result %>
+  <% @project_result = @project_content.project_result %>
 
   <table id="project_result_info">
     <tr>
@@ -20,10 +20,10 @@
 
   <h5><%= _('Source tree') %></h5>
 
-  <%= render :partial => '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="<%= project_content.profile.identifier %>" data-project-id='<%= project_content.id %>'>
-    <%= render :partial => 'module_result', :locals => { :module_result => project_content.module_result(project_content.project.name) } %>
+  <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">
@@ -32,6 +32,6 @@
 
 <% else %>
 
-  Joao Silva estah dormindo ...
+  <%= _("Loading results for %s ...") % project_content.project.name %>
 
 <% end %>.
diff --git a/plugins/mezuro/views/content_viewer/_source_tree.rhtml b/plugins/mezuro/views/content_viewer/_source_tree.rhtml
index 51cd7c0..3f9145d 100644
--- a/plugins/mezuro/views/content_viewer/_source_tree.rhtml
+++ b/plugins/mezuro/views/content_viewer/_source_tree.rhtml
@@ -19,7 +19,7 @@
       <td></td> 
       <td style="text-align: left">
         <% source_tree.children.each do |child| %>
-          <%= render :partial => 'source_tree', :locals => { :source_tree => child } %>
+          <%= render :partial => 'content_viewer/source_tree', :locals => { :source_tree => child } %>
         <% end %>
       </td> 
     </tr> 
diff --git a/plugins/mezuro/views/content_viewer/show_project.rhtml b/plugins/mezuro/views/content_viewer/show_project.rhtml
index 2133d07..3624ebb 100644
--- a/plugins/mezuro/views/content_viewer/show_project.rhtml
+++ b/plugins/mezuro/views/content_viewer/show_project.rhtml
@@ -44,7 +44,6 @@
 <% else %>
 
   <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 %>'>
-    <%= render :partial => 'autoreload', :locals => { :project_content => @project_content } %>
   </div> 
   
   <script type="text/javascript">
--
libgit2 0.21.2