diff --git a/plugins/mezuro/views/content_viewer/show_configuration.rhtml b/plugins/mezuro/views/content_viewer/show_configuration.rhtml
index 2a7708b..4679de2 100644
--- a/plugins/mezuro/views/content_viewer/show_configuration.rhtml
+++ b/plugins/mezuro/views/content_viewer/show_configuration.rhtml
@@ -22,8 +22,10 @@
 
   <br/>
 
-  <%= link_to "#{image_tag ('/plugins/mezuro/images/plus.png')}Add Metric", :controller => "mezuro_plugin_base_tool",
-  :action => "choose_base_tool", :params => { :id => @configuration_content.id } %><br/>
+  <%= link_to "#{image_tag ('/plugins/mezuro/images/plus.png')}Add Metric", :controller => "mezuro_plugin_base_tool", 
+  																			:profile => @page.profile.identifier, 
+  																			:action => "choose_base_tool", 
+  																			:id => @configuration_content.id %><br/>
 
   <table>
     <tr class="titles">
@@ -40,19 +42,22 @@
             <%= metric_configuration.metric.origin %>
           </td>
           <td><%= metric_configuration.code %></td>
-          <td><%= link_to "Edit", :controller => "mezuro_plugin_metric_configuration", :action => "edit_metric_configuration", :params =>
-            {:metric_name => metric_configuration.metric.name, :id => @configuration_content.id} %></td>
+          <td><%= link_to "Edit", :controller => "mezuro_plugin_metric_configuration", :action => "edit_metric_configuration", 
+          						  :metric_name => metric_configuration.metric.name, :id => @configuration_content.id, 
+          						  :profile => @page.profile.identifier %></td>
         <% else %>
           <td>
             Compound Metric
           </td>
           <td><%= metric_configuration.code %></td>
-          <td><%= link_to "Edit", :controller => "mezuro_plugin_metric_configuration", :action => "edit_compound_metric_configuration", :params =>
-            {:metric_name => metric_configuration.metric.name, :id => @configuration_content.id} %></td>
+          <td><%= link_to "Edit", :controller => "mezuro_plugin_metric_configuration", 
+          						  :action => "edit_compound_metric_configuration", :metric_name => metric_configuration.metric.name, 
+          						  :id => @configuration_content.id, :profile => @page.profile.identifier %></td>
         <% end %>
         
-        <td><%= link_to "Remove", :controller => "mezuro_plugin_metric_configuration", :action => "remove_metric_configuration", :params =>
-          {:metric_name => metric_configuration.metric.name, :id => @configuration_content.id} %></td>
+        <td><%= link_to "Remove", :controller => "mezuro_plugin_metric_configuration", :action => "remove_metric_configuration", 
+        						  :metric_name => metric_configuration.metric.name, :id => @configuration_content.id, 
+        						  :profile => @page.profile.identifier %></td>
       </tr>
     <% end %>
   </table>
diff --git a/plugins/mezuro/views/mezuro_plugin_base_tool/choose_base_tool.html.erb b/plugins/mezuro/views/mezuro_plugin_base_tool/choose_base_tool.html.erb
index 185f6d7..6b2f540 100644
--- a/plugins/mezuro/views/mezuro_plugin_base_tool/choose_base_tool.html.erb
+++ b/plugins/mezuro/views/mezuro_plugin_base_tool/choose_base_tool.html.erb
@@ -1,15 +1,15 @@
 <h2><%= @configuration_content.name%> Configuration</h2>
 
-<%= link_to "New Compound Metric", :controller => "mezuro_plugin_myprofile", :action => "new_compound_metric_configuration", :params =>
-{ :id => @configuration_content.id } %>
+<%= link_to "New Compound Metric", :controller => "mezuro_plugin_metric_configuration", :action => "new_compound_metric_configuration",
+								   :id => @configuration_content.id %>
 
 <h5>Base Tools:</h5>
 <table id="project_info">
   <% @base_tools.each do |base_tool| %>
     <tr>
       <td>
-        <%= link_to base_tool, :controller => "mezuro_plugin_base_tool", :action => "choose_metric", :params =>
-        { :base_tool => base_tool, :id => @configuration_content.id} %>
+        <%= link_to base_tool, :controller => "mezuro_plugin_base_tool", :action => "choose_metric", :base_tool => base_tool,
+        					   :id => @configuration_content.id %>
       </td>
     </tr>
   <% end %>
diff --git a/plugins/mezuro/views/mezuro_plugin_base_tool/choose_metric.html.erb b/plugins/mezuro/views/mezuro_plugin_base_tool/choose_metric.html.erb
index 06c1a62..879cf5f 100644
--- a/plugins/mezuro/views/mezuro_plugin_base_tool/choose_metric.html.erb
+++ b/plugins/mezuro/views/mezuro_plugin_base_tool/choose_metric.html.erb
@@ -10,8 +10,8 @@
   <% @supported_metrics.each do |metric| %>
     <tr class="metric" title="<%= metric.name %>">
       <td>
-        <%= link_to metric.name, :controller => "mezuro_plugin_myprofile", :action => "new_metric_configuration", :params => {:metric_name => metric.name,
-        :base_tool => @base_tool, :id => @configuration_content.id } %>
+        <%= link_to metric.name, :controller => "mezuro_plugin_metric_configuration", :action => "new_metric_configuration",
+        						 :metric_name => metric.name, :base_tool => @base_tool, :id => @configuration_content.id %>
       </td>
     </tr>
   <% end %>
diff --git a/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_compound_metric_configuration.html.erb b/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_compound_metric_configuration.html.erb
index dffd5dc..3c4518e 100644
--- a/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_compound_metric_configuration.html.erb
+++ b/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_compound_metric_configuration.html.erb
@@ -67,7 +67,7 @@
   </tr>
   <% if (@metric_configuration.ranges!=nil) 
     @metric_configuration.ranges.each do |range| %>
-      <%= render :partial => "range", :locals => {:range => range, :id => @configuration_content.id, 
+      <%= render :partial => "mezuro_plugin_range/range", :locals => {:range => range, :id => @configuration_content.id, 
           :metric_name => @metric_configuration.metric.name} %>
     <% end
   end %>
diff --git a/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_metric_configuration.html.erb b/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_metric_configuration.html.erb
index 401ab1d..91e3175 100644
--- a/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_metric_configuration.html.erb
+++ b/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_metric_configuration.html.erb
@@ -76,7 +76,7 @@
   </tr>
   <% if (@metric_configuration.ranges!=nil) 
     @metric_configuration.ranges.each do |range| %>
-      <%= render :partial => "range", :locals => {:range => range, :id => @configuration_content.id, 
+      <%= render :partial => "mezuro_plugin_range/range", :locals => {:range => range, :id => @configuration_content.id, 
           :metric_name => @metric.name} %>
     <% end
   end %>
diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/choose_base_tool.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/choose_base_tool.html.erb
deleted file mode 100644
index 4fb7134..0000000
--- a/plugins/mezuro/views/mezuro_plugin_myprofile/choose_base_tool.html.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<h2><%= @configuration_content.name%> Configuration</h2>
-
-<%= link_to "New Compound Metric", :controller => "mezuro_plugin_myprofile", :action => "new_compound_metric_configuration", :params =>
-{ :id => @configuration_content.id } %>
-
-<h5>Base Tools:</h5>
-<table id="project_info">
-  <% @base_tools.each do |base_tool| %>
-    <tr>
-      <td>
-        <%= link_to base_tool, :controller => "mezuro_plugin_myprofile", :action => "choose_metric", :params =>
-        { :base_tool => base_tool, :id => @configuration_content.id} %>
-      </td>
-    </tr>
-  <% end %>
-</table>
diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/choose_metric.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/choose_metric.html.erb
deleted file mode 100644
index 06c1a62..0000000
--- a/plugins/mezuro/views/mezuro_plugin_myprofile/choose_metric.html.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-<h2><%= @configuration_content.name %> Configuration</h2>
-
-<table id="project_info">
-  <tr>
-    <h5>Metric Collector: <%= @base_tool %></h5>
-  </tr>
-  <tr>
-    <h5>Choose a metric to add:</h5>
-  </tr>
-  <% @supported_metrics.each do |metric| %>
-    <tr class="metric" title="<%= metric.name %>">
-      <td>
-        <%= link_to metric.name, :controller => "mezuro_plugin_myprofile", :action => "new_metric_configuration", :params => {:metric_name => metric.name,
-        :base_tool => @base_tool, :id => @configuration_content.id } %>
-      </td>
-    </tr>
-  <% end %>
-</table>
--
libgit2 0.21.2