diff --git a/plugins/mezuro/controllers/myprofile/mezuro_plugin_metric_configuration_controller.rb b/plugins/mezuro/controllers/myprofile/mezuro_plugin_metric_configuration_controller.rb
index 0c51822..ce0901b 100644
--- a/plugins/mezuro/controllers/myprofile/mezuro_plugin_metric_configuration_controller.rb
+++ b/plugins/mezuro/controllers/myprofile/mezuro_plugin_metric_configuration_controller.rb
@@ -9,9 +9,9 @@ class MezuroPluginMetricConfigurationController < MezuroPluginMyprofileControlle
 
   def new_native
     @configuration_content = profile.articles.find(params[:id])
-    @base_tool_name = params[:base_tool_name]
-    @metric = Kalibro::BaseTool.find_by_name(@base_tool_name).metric params[:metric_name]
     @reading_group_names_and_ids = reading_group_names_and_ids
+    @metric = Kalibro::BaseTool.find_by_name(params[:base_tool_name]).metric params[:metric_name]
+    @metric_configuration = Kalibro::MetricConfiguration.new :base_tool_name => params[:base_tool_name], :metric => @metric
   end
 
   def edit_native
@@ -22,6 +22,8 @@ class MezuroPluginMetricConfigurationController < MezuroPluginMyprofileControlle
     @configuration_content = profile.articles.find(params[:id])
     @metric_configurations = @configuration_content.metric_configurations
     @reading_group_names_and_ids = reading_group_names_and_ids
+    metric = Kalibro::Metric.new :compound => true
+    @metric_configuration = Kalibro::MetricConfiguration.new :metric => metric
     if configuration_content_has_errors?
       redirect_to_error_page @configuration_content.errors[:base]
     end
@@ -34,11 +36,11 @@ class MezuroPluginMetricConfigurationController < MezuroPluginMyprofileControlle
   def create
     configuration_content = profile.articles.find(params[:id])
     metric_configuration = Kalibro::MetricConfiguration.create(params[:metric_configuration])
-
+    
     if metric_configuration_has_errors? metric_configuration
       redirect_to_error_page metric_configuration.errors[0].message
     else
-      redirect_to(metric_configuration_url(configuration_content))
+      redirect_to(metric_configuration_url(configuration_content, metric_configuration.id))
     end
   end
 
@@ -85,12 +87,12 @@ class MezuroPluginMetricConfigurationController < MezuroPluginMyprofileControlle
     not @configuration_content.errors[:base].nil?
   end
 
-  def metric_configuration_url configuration_content
+  def metric_configuration_url(configuration_content, metric_configuration_id)
     url = configuration_content.view_url
     url[:controller] = controller_name
     url[:id] = configuration_content.id
-    url[:metric_configuration_id] = params[:metric_configuration][:id].to_i
-    url[:action] = (params[:metric_configuration][:metric][:compound] ? "edit_compound" : "edit_native")
+    url[:metric_configuration_id] = metric_configuration_id
+    url[:action] = (params[:metric_configuration][:metric][:compound] == "true" ? "edit_compound" : "edit_native")
     url
   end
 
@@ -104,3 +106,4 @@ class MezuroPluginMetricConfigurationController < MezuroPluginMyprofileControlle
   end
 
 end
+
diff --git a/plugins/mezuro/controllers/myprofile/mezuro_plugin_range_controller.rb b/plugins/mezuro/controllers/myprofile/mezuro_plugin_range_controller.rb
index 7f73588..77331b8 100644
--- a/plugins/mezuro/controllers/myprofile/mezuro_plugin_range_controller.rb
+++ b/plugins/mezuro/controllers/myprofile/mezuro_plugin_range_controller.rb
@@ -40,8 +40,7 @@ class MezuroPluginRangeController < MezuroPluginMyprofileController
   end
 
   def reading_labels_and_ids
-    array = Kalibro::Reading.readings_of(params[:reading_group_id].to_i).map { |reading| [reading.label, reading.id] }
-    array.sort { |x,y| x.first.downcase <=> y.first.downcase }
+    Kalibro::Reading.readings_of(params[:reading_group_id].to_i).map { |reading| [reading.label, reading.id] }
   end
 
   def save_range
diff --git a/plugins/mezuro/controllers/profile/mezuro_plugin_repository_controller.rb b/plugins/mezuro/controllers/profile/mezuro_plugin_repository_controller.rb
index 2e64c9c..59c5a4e 100644
--- a/plugins/mezuro/controllers/profile/mezuro_plugin_repository_controller.rb
+++ b/plugins/mezuro/controllers/profile/mezuro_plugin_repository_controller.rb
@@ -19,7 +19,7 @@ class MezuroPluginRepositoryController < MezuroPluginProfileController
 
     if( repository.errors.empty? )
       repository.process
-      redirect_to(repository_url(project_content))
+      redirect_to(repository_url(project_content, repository.id))
     else
       redirect_to_error_page repository.errors[0].message
     end
@@ -27,13 +27,13 @@ class MezuroPluginRepositoryController < MezuroPluginProfileController
 
   def show 
     @project_content = profile.articles.find(params[:id])
-    @repository = @project_content.repositories.select{ |repository| repository.id.to_s == params[:repository_id] }.first
+    @repository = @project_content.repositories.select{ |repository| repository.id == params[:repository_id].to_i }.first
     @configuration_name = Kalibro::Configuration.configuration_of(@repository.id).name
   end
 
   def destroy
     project_content = profile.articles.find(params[:id])
-    repository = project_content.repositories.select{ |repository| repository.id.to_s == params[:repository_id] }.first
+    repository = Kalibro::Repository.new :id => params[:repository_id] 
     repository.destroy
     if( repository.errors.empty? )
       redirect_to project_content.view_url
@@ -44,11 +44,11 @@ class MezuroPluginRepositoryController < MezuroPluginProfileController
 
   private
   
-  def repository_url project_content
+  def repository_url(project_content, repository_id)
     url = project_content.view_url
     url[:controller] = controller_name
     url[:id] = project_content.id
-    url[:repository_id] = params[:repository_id].to_i
+    url[:repository_id] = repository_id
     url[:action] = "show"
     url
   end
diff --git a/plugins/mezuro/lib/mezuro_plugin/helpers/content_viewer_helper.rb b/plugins/mezuro/lib/mezuro_plugin/helpers/content_viewer_helper.rb
index c6619d6..9208588 100644
--- a/plugins/mezuro/lib/mezuro_plugin/helpers/content_viewer_helper.rb
+++ b/plugins/mezuro/lib/mezuro_plugin/helpers/content_viewer_helper.rb
@@ -17,9 +17,7 @@ class MezuroPlugin::Helpers::ContentViewerHelper
   def self.license_options
    options = YAML.load_file("#{RAILS_ROOT}/plugins/mezuro/licenses.yml")
    options = options.split(";")
-   formated_options = []
-   options.each { |option| formated_options << [option, option] }
-   formated_options
+   options
   end
 
   def self.generate_chart(score_history)
diff --git a/plugins/mezuro/test/functional/myprofile/mezuro_plugin_metric_configuration_controller_test.rb b/plugins/mezuro/test/functional/myprofile/mezuro_plugin_metric_configuration_controller_test.rb
index c9d00b5..d3a72fb 100644
--- a/plugins/mezuro/test/functional/myprofile/mezuro_plugin_metric_configuration_controller_test.rb
+++ b/plugins/mezuro/test/functional/myprofile/mezuro_plugin_metric_configuration_controller_test.rb
@@ -56,7 +56,7 @@ class MezuroPluginMetricConfigurationControllerTest < ActionController::TestCase
     get :new_native, :profile => @profile.identifier, :id => @configuration_content.id, :base_tool_name => @base_tool.name, :metric_name => @metric.name
     assert_equal @configuration_content, assigns(:configuration_content)
     assert_equal @metric.name, assigns(:metric).name
-    assert_equal @base_tool.name, assigns(:base_tool_name)
+    assert_equal @base_tool.name, assigns(:metric_configuration).base_tool_name
     assert_equal [[@reading_group.name,@reading_group.id]], assigns(:reading_group_names_and_ids)
     assert_response :success
   end
diff --git a/plugins/mezuro/test/functional/profile/mezuro_plugin_repository_controller_test.rb b/plugins/mezuro/test/functional/profile/mezuro_plugin_repository_controller_test.rb
index 1da7422..7673f81 100644
--- a/plugins/mezuro/test/functional/profile/mezuro_plugin_repository_controller_test.rb
+++ b/plugins/mezuro/test/functional/profile/mezuro_plugin_repository_controller_test.rb
@@ -84,9 +84,8 @@ class MezuroPluginRepositoryControllerTest < ActionController::TestCase
   end
 
   should 'destroy a repository' do
+    Kalibro::Repository.expects(:new).with(:id => @repository.id.to_s).returns(@repository)
     @repository.expects(:destroy)    
-    Kalibro::Repository.expects(:repositories_of).with(@content.project_id).returns([@repository])
-
     get :destroy, :profile => @profile.identifier, :id => @content.id, :repository_id => @repository.id
 
     assert @repository.errors.empty?
@@ -95,12 +94,11 @@ class MezuroPluginRepositoryControllerTest < ActionController::TestCase
 
   should 'not destroy a repository' do
     @repository.errors = [Exception.new]
+    Kalibro::Repository.expects(:new).with(:id => @repository.id.to_s).returns(@repository)
     @repository.expects(:destroy)    
-    Kalibro::Repository.expects(:repositories_of).with(@content.project_id).returns([@repository])
-
     get :destroy, :profile => @profile.identifier, :id => @content.id, :repository_id => @repository.id
 
-    assert !@repository.errors.empty?
+    #TODO verify if it is redirected to the right page
     assert_response :redirect
   end
 end
diff --git a/plugins/mezuro/views/cms/mezuro_plugin/_configuration_content.html.erb b/plugins/mezuro/views/cms/mezuro_plugin/_configuration_content.html.erb
index 96e3a8c..4f5e3d8 100644
--- a/plugins/mezuro/views/cms/mezuro_plugin/_configuration_content.html.erb
+++ b/plugins/mezuro/views/cms/mezuro_plugin/_configuration_content.html.erb
@@ -9,18 +9,11 @@
 
 
 <%= hidden_field_tag 'configuration_content[profile_id]', profile.id %>
-<%= hidden_field_tag 'id', @article.id %>
 <%= hidden_field_tag 'configuration_id', @article.configuration_id %>
+<%= render :partial => "cms/mezuro_plugin/mezuro_content_form", :locals => {:f => f} %>
 
-<%= required_fields_message %>
-
-<%= required f.text_field(:name) %>
-
-<%= f.text_field :description %><br/>
-
+<br/>
 <%= if kalibro_configuration.nil?
   required labelled_form_field _('Clone Configuration'),
   f.select(:configuration_to_clone_id, configuration_names_and_ids)
 end %>
-<br/>
-
diff --git a/plugins/mezuro/views/cms/mezuro_plugin/_mezuro_content_form.html.erb b/plugins/mezuro/views/cms/mezuro_plugin/_mezuro_content_form.html.erb
new file mode 100644
index 0000000..149de85
--- /dev/null
+++ b/plugins/mezuro/views/cms/mezuro_plugin/_mezuro_content_form.html.erb
@@ -0,0 +1,4 @@
+<%= hidden_field_tag 'id', @article.id %>
+<%= required_fields_message %>
+<%= required f.text_field(:name) %>
+<%= f.text_field :description %><br/>
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 1836692..acce453 100644
--- a/plugins/mezuro/views/cms/mezuro_plugin/_project_content.html.erb
+++ b/plugins/mezuro/views/cms/mezuro_plugin/_project_content.html.erb
@@ -7,14 +7,5 @@
 <%= error_messages_for 'project_content' %>
 
 <%= hidden_field_tag 'project_content[profile_id]', profile.id %>
-<%= hidden_field_tag 'id', @article.id %>
 <%= hidden_field_tag 'project_id', @article.project_id %>
-
-<%= required_fields_message %>
-
-<%= required f.text_field(:name) %>
-
-<%= f.text_field :description %><br/>
-
-<!-- partial rendered in app/views/cms/edit.rhtml -->
-<!-- After submit, the action cms/new is called -->
+<%= render :partial => "cms/mezuro_plugin/mezuro_content_form", :locals => {:f => f} %>
diff --git a/plugins/mezuro/views/cms/mezuro_plugin/_reading_group_content.html.erb b/plugins/mezuro/views/cms/mezuro_plugin/_reading_group_content.html.erb
index d7f9ce6..61fc7e8 100644
--- a/plugins/mezuro/views/cms/mezuro_plugin/_reading_group_content.html.erb
+++ b/plugins/mezuro/views/cms/mezuro_plugin/_reading_group_content.html.erb
@@ -7,14 +7,5 @@
 <%= error_messages_for 'reading_group_content' %>
 
 <%= hidden_field_tag 'reading_group_content[profile_id]', profile.id %>
-<%= hidden_field_tag 'id', @article.id %>
 <%= hidden_field_tag 'reading_group_id', (reading_group.id unless reading_group.nil?) %>
-
-<%= required_fields_message %>
-
-<%= required f.text_field(:name) %>
-
-<%= f.text_field :description %><br/>
-
-<!-- partial rendered in app/views/cms/edit.rhtml -->
-<!-- After submit, the action cms/new is called -->
+<%= render :partial => "cms/mezuro_plugin/mezuro_content_form", :locals => {:f => f} %>
diff --git a/plugins/mezuro/views/content_viewer/show_configuration.rhtml b/plugins/mezuro/views/content_viewer/show_configuration.rhtml
index 7b74740..f592b9f 100644
--- a/plugins/mezuro/views/content_viewer/show_configuration.rhtml
+++ b/plugins/mezuro/views/content_viewer/show_configuration.rhtml
@@ -1,5 +1,6 @@
 <% @configuration_content = @page
 @kalibro_configuration = @page.kalibro_configuration %>
+<!-- #TODO check owner verification to remove or edit metric configuration -->
 <% owner = (not user.nil?) && user.id == @profile.id %>
 <% unless @page.errors[:base].nil? %>
   <% if @page.errors[:base] =~ /Kalibro::Errors::RecordNotFound/ %>
diff --git a/plugins/mezuro/views/content_viewer/show_project.rhtml b/plugins/mezuro/views/content_viewer/show_project.rhtml
index 12043ee..0214d68 100644
--- a/plugins/mezuro/views/content_viewer/show_project.rhtml
+++ b/plugins/mezuro/views/content_viewer/show_project.rhtml
@@ -1,5 +1,6 @@
 <% @project = @page.project %>
 <% unless @page.errors[:base].nil? %>
+<!-- #TODO add owner verification to remove or edit repository -->
   <% if @page.errors[:base] == "Kalibro::Errors::RecordNotFound" %>
     <h3>Warning:</h3>
     <p>This project doesn't exist on the Web Service. Do you want to <%= link_to 'delete', :action => 'destroy', :controller => 'cms', :profile => @page.profile.identifier, :id => @page.id %> or <%= link_to 'save it again', :action => 'edit', :controller => 'cms', :profile => @page.profile.identifier, :id => @page.id %>?</p>
diff --git a/plugins/mezuro/views/content_viewer/show_reading_group.rhtml b/plugins/mezuro/views/content_viewer/show_reading_group.rhtml
index 446ae40..5b09416 100644
--- a/plugins/mezuro/views/content_viewer/show_reading_group.rhtml
+++ b/plugins/mezuro/views/content_viewer/show_reading_group.rhtml
@@ -1,4 +1,5 @@
 <% @reading_group = @page.reading_group %>
+<!-- #TODO add owner verification to remove or edit reading group -->
 <% unless @page.errors[:base].nil? %>
   <% if @page.errors[:base] == "Kalibro::Errors::RecordNotFound" %>
     <h3>Warning:</h3>
diff --git a/plugins/mezuro/views/mezuro_plugin_metric_configuration/_compound_metric_configuration_form.html.erb b/plugins/mezuro/views/mezuro_plugin_metric_configuration/_compound_metric_configuration_form.html.erb
new file mode 100644
index 0000000..8c184fe
--- /dev/null
+++ b/plugins/mezuro/views/mezuro_plugin_metric_configuration/_compound_metric_configuration_form.html.erb
@@ -0,0 +1,19 @@
+<%= hidden_field_tag :id, @configuration_content.id %>
+<%= f.hidden_field :configuration_id, :value => @configuration_content.configuration_id %>
+
+<% f.fields_for :metric do |m| %>
+  <%= m.hidden_field :compound, :value => "true" %>
+  <%= required labelled_form_field _('Metric Name:'), m.text_field(:name, :value => @metric_configuration.metric.name) %>
+  <%= labelled_form_field _('Description:'), m.text_field(:description, :value => @metric_configuration.metric.description) %>
+  <%= required labelled_form_field _('Script:'), m.text_area(:script, :rows => 5, :value => @metric_configuration.metric.script) %>
+  <%= required labelled_form_field _('Scope:'), 
+        m.select(:scope, MezuroPlugin::Helpers::ContentViewerHelper.scope_options, :selected => @metric_configuration.metric.scope) %>
+<% end %>
+
+<%= required labelled_form_field _('Code:'), f.text_field(:code) %>
+<%= required labelled_form_field _('Aggregation Form:'),
+    f.select(:aggregation_form, MezuroPlugin::Helpers::ContentViewerHelper.aggregation_options) %>
+<%= required labelled_form_field _('Weight:'), f.text_field(:weight) %>
+<%= required labelled_form_field _('Reading Group:'), f.select(:reading_group_id, @reading_group_names_and_ids) %>
+
+<p><%= f.submit "Save" %></p>
diff --git a/plugins/mezuro/views/mezuro_plugin_metric_configuration/_metric_configuration_view.rhtml b/plugins/mezuro/views/mezuro_plugin_metric_configuration/_metric_configuration_view.rhtml
deleted file mode 100644
index 5a8fcd0..0000000
--- a/plugins/mezuro/views/mezuro_plugin_metric_configuration/_metric_configuration_view.rhtml
+++ /dev/null
@@ -1,15 +0,0 @@
-<p> 
-  <b>Collector Name:</b> <%= @metric_configuration.base_tool_name %>
-</p>
-<p> 
-  <b>Metric Name:</b> <%= @metric.name %>
-</p>
-<p>
-  <b>Code:</b> <%= @metric_configuration.code %>
-</p>
-<p>
-  <b>Aggregation Form:</b> <%= @metric_configuration.aggregation_form %>
-</p>
-<p>
- <b>Weight:</b> <%= @metric_configuration.weight %>
-</p>
diff --git a/plugins/mezuro/views/mezuro_plugin_metric_configuration/_native_metric_configuration_form.rhtml b/plugins/mezuro/views/mezuro_plugin_metric_configuration/_native_metric_configuration_form.rhtml
index 1adf7a4..b54bd42 100644
--- a/plugins/mezuro/views/mezuro_plugin_metric_configuration/_native_metric_configuration_form.rhtml
+++ b/plugins/mezuro/views/mezuro_plugin_metric_configuration/_native_metric_configuration_form.rhtml
@@ -1,31 +1,26 @@
-<% form_for :metric_configuration, :url => {:action =>"update", :controller => "mezuro_plugin_metric_configuration"}, :method => :get do |f| %>
-  <%= hidden_field_tag :id, @configuration_content.id %>
-  <%= f.hidden_field :configuration_id, :value => @configuration_content.configuration_id %>
-  <%= f.hidden_field :id %>
+<%= hidden_field_tag :id, @configuration_content.id %>
+<%= f.hidden_field :configuration_id, :value => @configuration_content.configuration_id %>
 
-  <%= labelled_form_field _('Collector Name:'), f.text_field(:base_tool_name, :readonly => true) %>
+<%= labelled_form_field _('Collector Name:'), f.text_field(:base_tool_name, :readonly => true) %>
 
-  <% f.fields_for :metric do |m| %>
-    <%= m.hidden_field :compound, :value => "false" %>
-    <% @metric.language.each do |language| %>
-      <%= m.hidden_field :language, :multiple => true, :value => language %>
-    <% end %>
-    <%= m.hidden_field "scope", :value => @metric.scope %>
-    <%= labelled_form_field _('Metric Name:'), m.text_field(:name, :value => @metric.name, :readonly => true) %>
-    <%= labelled_form_field _('Description:'), m.text_field(:description, :value => @metric.description, :readonly => true) %>
+<% f.fields_for :metric do |m| %>
+  <%= m.hidden_field :compound, :value => "false" %>
+  <% @metric_configuration.metric.language.each do |language| %>
+    <%= m.hidden_field :language, :multiple => true, :value => language %>
   <% end %>
-  
-  <%= required labelled_form_field _('Code:'), f.text_field(:code) %>
+  <%= m.hidden_field "scope", :value => @metric.scope %>
+  <%= required labelled_form_field _('Metric Name:'), m.text_field(:name, :readonly => true, :value => @metric.name) %>
+  <%= labelled_form_field _('Description:'), m.text_field(:description, :readonly => true, :value => @metric.description) %>
+<% end %>
 
-  <%= required labelled_form_field _('Aggregation Form:'),
-  f.select(:aggregation_form, MezuroPlugin::Helpers::ContentViewerHelper.aggregation_options) %>
+<%= required labelled_form_field _('Code:'), f.text_field(:code) %>
 
-  <%= required labelled_form_field _('Weight:'), f.text_field(:weight) %>
-  
-  <%= required labelled_form_field _('Reading Group:'),
-  f.select(:reading_group_id, @reading_group_names_and_ids) %>
-  
-  <p>
-    <%= f.submit "Save" %>
-  </p>
-<% end %>
+<%= required labelled_form_field _('Aggregation Form:'),
+f.select(:aggregation_form, MezuroPlugin::Helpers::ContentViewerHelper.aggregation_options) %>
+
+<%= required labelled_form_field _('Weight:'), f.text_field(:weight) %>
+
+<%= required labelled_form_field _('Reading Group:'),
+f.select(:reading_group_id, @reading_group_names_and_ids) %>
+
+<p><%= f.submit "Save" %></p>
diff --git a/plugins/mezuro/views/mezuro_plugin_metric_configuration/_native_metric_configuration_view.rhtml b/plugins/mezuro/views/mezuro_plugin_metric_configuration/_native_metric_configuration_view.rhtml
new file mode 100644
index 0000000..5a8fcd0
--- /dev/null
+++ b/plugins/mezuro/views/mezuro_plugin_metric_configuration/_native_metric_configuration_view.rhtml
@@ -0,0 +1,15 @@
+<p> 
+  <b>Collector Name:</b> <%= @metric_configuration.base_tool_name %>
+</p>
+<p> 
+  <b>Metric Name:</b> <%= @metric.name %>
+</p>
+<p>
+  <b>Code:</b> <%= @metric_configuration.code %>
+</p>
+<p>
+  <b>Aggregation Form:</b> <%= @metric_configuration.aggregation_form %>
+</p>
+<p>
+ <b>Weight:</b> <%= @metric_configuration.weight %>
+</p>
diff --git a/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_compound.html.erb b/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_compound.html.erb
index 20c0f9e..d3db193 100644
--- a/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_compound.html.erb
+++ b/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_compound.html.erb
@@ -7,57 +7,8 @@
 <% owner = (not user.nil?) && user.id == @profile.id %>
 
 <% form_for :metric_configuration, :url => {:action =>"update", :controller => "mezuro_plugin_metric_configuration"}, :method => :get do |f| %>
-  <%= hidden_field_tag :id, @configuration_content.id %>
-  <%= f.hidden_field :configuration_id, :value => @configuration_content.configuration_id %>
   <%= f.hidden_field :id %>
-  
-  <% f.fields_for :metric do |m| %>
-    <%= m.hidden_field :compound, :value => "true" %>
-    <%= required labelled_form_field _('Metric Name:'), m.text_field(:name, :value => @metric.name) %>
-    <%= labelled_form_field _('Description:'), m.text_field(:description, :value => @metric.description) %>
-    <%= required labelled_form_field _('Script:'), m.text_area(:script, :rows => 5, :value => @metric.script) %>
-    <%= required labelled_form_field _('Scope:'), 
-          m.select(:scope, MezuroPlugin::Helpers::ContentViewerHelper.scope_options, :selected => @metric.scope) %>
-  <% end %>
-  
-  <%= required labelled_form_field _('Code:'), f.text_field(:code) %>
-  <%= required labelled_form_field _('Aggregation Form:'),
-      f.select(:aggregation_form, MezuroPlugin::Helpers::ContentViewerHelper.aggregation_options) %>
-  <%= required labelled_form_field _('Weight:'), f.text_field(:weight) %>
-  <%= required labelled_form_field _('Reading Group:'), f.select(:reading_group_id, @reading_group_names_and_ids) %>
-  
-  <p><%= f.submit "Save" %></p>
-  
+  <%= render :partial => "compound_metric_configuration_form", :locals => {:f => f} %>
 <% end %>
 
-<h5> Ranges </h5><br/>
-
-<table id="ranges">
-  <tr>
-    <td>
-      Label
-    </td>
-    <td>
-      Beginning
-    </td>
-    <td>
-      End
-    </td>
-    <td>
-      Grade
-    </td>
-    <td>
-      Color
-    </td>       
-  </tr>
-  <% @ranges.each do |range| %>
-      <%= render :partial => "mezuro_plugin_range/range", :locals => {:range => range, :id => @configuration_content.id, 
-          :metric_configuration_id => @metric_configuration.id, :reading_group_id => @metric_configuration.reading_group_id, :compound => @metric_configuration.metric.compound} %>
-  <% end %>
-</table>
-
-<br/>
-<% if owner %>
-  <%= link_to_remote "New Range", :url => {:action =>"new", :controller => "mezuro_plugin_range", :id => @configuration_content.id, :metric_configuration_id => @metric_configuration.id, :reading_group_id => @metric_configuration.reading_group_id} %>
-<% end %>
-<div id="form" style="display:none"></div>
+<%= render :partial => "mezuro_plugin_range/ranges", :locals => {:owner => owner} %>
diff --git a/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_native.html.erb b/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_native.html.erb
index 44230e8..3df61dd 100644
--- a/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_native.html.erb
+++ b/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_native.html.erb
@@ -7,42 +7,12 @@
 <% owner = (not user.nil?) && user.id == @profile.id %>
 
 <% if owner %>
-  <%=  render :partial => "native_metric_configuration_form" %>
-<% else %>
-  <%=  render :partial => "metric_configuration_view" %>
-<% end %>
-
-<h5> Ranges </h5><br/>
-
-<table id="ranges">
-  <tr>
-    <td>
-      Label
-    </td>
-    <td>
-      Beginning
-    </td>
-    <td>
-      End
-    </td>
-    <td>
-      Grade
-    </td>
-    <td>
-      Color
-    </td>   
-    <td></td>    
-    <td></td>
-  </tr>
-  <% @ranges.each do |range| %>
-      <%= render :partial => "mezuro_plugin_range/range", :locals => {:range => range, :id => @configuration_content.id, 
-          :metric_configuration_id => @metric_configuration.id, :reading_group_id => @metric_configuration.reading_group_id, :compound => @metric_configuration.metric.compound} %>
+  <% form_for :metric_configuration, :url => {:action =>"update", :controller => "mezuro_plugin_metric_configuration"}, :method => :get do |f| %>
+    <%= f.hidden_field :id %>
+    <%= render :partial => "native_metric_configuration_form", :locals => {:f => f} %>
   <% end %>
-</table>
-
-<br/>
-<% if owner %>
-  <%= link_to_remote "New Range", :url => {:action =>"new", :controller => "mezuro_plugin_range", :id => @configuration_content.id, :metric_configuration_id => @metric_configuration.id, :reading_group_id => @metric_configuration.reading_group_id, :compound => @metric_configuration.metric.compound} %>
+<% else %>
+  <%=  render :partial => "native_metric_configuration_view" %>
 <% end %>
-<div id="form" style="display:none"></div>
 
+<%= render :partial => "mezuro_plugin_range/ranges", :locals => {:owner => owner} %>
diff --git a/plugins/mezuro/views/mezuro_plugin_metric_configuration/new_compound.html.erb b/plugins/mezuro/views/mezuro_plugin_metric_configuration/new_compound.html.erb
index ab5e89c..5a749a3 100644
--- a/plugins/mezuro/views/mezuro_plugin_metric_configuration/new_compound.html.erb
+++ b/plugins/mezuro/views/mezuro_plugin_metric_configuration/new_compound.html.erb
@@ -1,26 +1,7 @@
 <h2><%= link_to("#{@configuration_content.name} Configuration", @configuration_content.view_url) %></h2>
 
 <% form_for :metric_configuration, :url => {:action =>"create", :controller => "mezuro_plugin_metric_configuration"}, :method => :get do |f| %>
-  <%= hidden_field_tag :id, @configuration_content.id %>
-  <%= f.hidden_field :configuration_id, :value => @configuration_content.configuration_id %>
-
-  <% f.fields_for :metric do |m| %>
-    <%= m.hidden_field :compound, :value => "true" %>
-    <%= required labelled_form_field _('Metric Name:'), m.text_field(:name) %>
-    <%= labelled_form_field _('Description:'), m.text_field(:description) %>
-    <%= required labelled_form_field _('Script:'), m.text_area(:script, :rows => 5) %>
-    <%= required labelled_form_field _('Scope:'), m.select(:scope, MezuroPlugin::Helpers::ContentViewerHelper.scope_options) %>
-  <% end %>
-
-  <%= required labelled_form_field _('Code:'), f.text_field(:code) %>
-  <%= required labelled_form_field _('Aggregation Form:'), f.select(:aggregation_form, MezuroPlugin::Helpers::ContentViewerHelper.aggregation_options) %>
-  <%= required labelled_form_field _('Weight:'), f.text_field(:weight) %>
-  <%= required labelled_form_field _('Reading Group:'),
-  f.select(:reading_group_id, @reading_group_names_and_ids) %>
-  
-  <p> <%= f.submit "Add" %> </p>
+  <%= render :partial => "compound_metric_configuration_form", :locals => {:f => f} %>
 <% end %>
 
 <%= render :partial => "metric_codes", :locals => {:metric_configurations => @metric_configurations} %>
-
-
diff --git a/plugins/mezuro/views/mezuro_plugin_metric_configuration/new_native.html.erb b/plugins/mezuro/views/mezuro_plugin_metric_configuration/new_native.html.erb
index f3396d0..8b74013 100644
--- a/plugins/mezuro/views/mezuro_plugin_metric_configuration/new_native.html.erb
+++ b/plugins/mezuro/views/mezuro_plugin_metric_configuration/new_native.html.erb
@@ -1,37 +1,7 @@
 <script src="/plugins/mezuro/javascripts/validations.js" type="text/javascript"></script>
 
 <h2><%= link_to("#{@configuration_content.name} Configuration", @configuration_content.view_url) %></h2>
-<!-- TODO This form should be a partial similar to _native_metric_configuration_form.rhtml -->
-<% form_for :metric_configuration, :url => {:action =>"create", :controller => "mezuro_plugin_metric_configuration"},  :method => :get do |f| %>
-
-  <%= hidden_field_tag :id, @configuration_content.id %>
-  <%= f.hidden_field :configuration_id, :value => @configuration_content.configuration_id %>
-
-  <%= labelled_form_field _('Collector Name:'), f.text_field(:base_tool_name, :value => @base_tool_name, :readonly => true) %>
-
-  <% f.fields_for :metric do |m| %>
-    <%= m.hidden_field :compound, :value => "false" %>
-    <% @metric.language.each do |language| %>
-      <%= m.hidden_field :language, :multiple => true, :value => language %>
-    <% end %>
-    <%= m.hidden_field "scope", :value => @metric.scope %>
-    <%= labelled_form_field _('Metric Name:'), m.text_field(:name, :value => @metric.name, :readonly => true) %>
-    <%= labelled_form_field _('Description:'), m.text_field(:description, :value => @metric.description, :readonly => true) %>
-  <% end %>
-
-  <%= required labelled_form_field _('Code:'), f.text_field(:code) %>
-
-  <%= required labelled_form_field _('Aggregation Form:'),
-  f.select(:aggregation_form, MezuroPlugin::Helpers::ContentViewerHelper.aggregation_options) %>
-
-  <%= required labelled_form_field _('Weight:'), f.text_field(:weight) %>
-
-  <%= required labelled_form_field _('Reading Group:'),
-  f.select(:reading_group_id, @reading_group_names_and_ids) %>
-
-  <p>
-    <%= f.submit "Save" %>
-  </p>
 
+<% form_for :metric_configuration, :url => {:action =>"create", :controller => "mezuro_plugin_metric_configuration"},  :method => :get do |f| %>
+  <%= render :partial => "native_metric_configuration_form", :locals => {:f => f} %>
 <% end %>
-
diff --git a/plugins/mezuro/views/mezuro_plugin_range/_ranges.html.erb b/plugins/mezuro/views/mezuro_plugin_range/_ranges.html.erb
new file mode 100644
index 0000000..5589184
--- /dev/null
+++ b/plugins/mezuro/views/mezuro_plugin_range/_ranges.html.erb
@@ -0,0 +1,31 @@
+<h5> Ranges </h5><br/>
+
+<table id="ranges">
+  <tr>
+    <td>
+      Label
+    </td>
+    <td>
+      Beginning
+    </td>
+    <td>
+      End
+    </td>
+    <td>
+      Grade
+    </td>
+    <td>
+      Color
+    </td>       
+  </tr>
+  <% @ranges.each do |range| %>
+      <%= render :partial => "mezuro_plugin_range/range", :locals => {:range => range, :id => @configuration_content.id, 
+          :metric_configuration_id => @metric_configuration.id, :reading_group_id => @metric_configuration.reading_group_id, :compound => @metric_configuration.metric.compound} %>
+  <% end %>
+</table>
+
+<br/>
+<% if owner %>
+  <%= link_to_remote "New Range", :url => {:action =>"new", :controller => "mezuro_plugin_range", :id => @configuration_content.id, :metric_configuration_id => @metric_configuration.id, :reading_group_id => @metric_configuration.reading_group_id, :compound => @metric_configuration.metric.compound} %>
+<% end %>
+<div id="form" style="display:none"></div>
diff --git a/plugins/mezuro/views/mezuro_plugin_reading/_form.html.erb b/plugins/mezuro/views/mezuro_plugin_reading/_form.html.erb
new file mode 100644
index 0000000..7946c56
--- /dev/null
+++ b/plugins/mezuro/views/mezuro_plugin_reading/_form.html.erb
@@ -0,0 +1,11 @@
+<%= hidden_field_tag :id, @reading_group_content.id %>
+
+<%= required labelled_form_field _('label:'), f.text_field(:label) %> 
+
+<%= required labelled_form_field _('grade:'),
+f.text_field(:grade) %>
+
+<%= required labelled_form_field _('color:'),
+colorpicker_field(:reading, :color) %>Click in the field to change Color
+
+<p><%= f.submit "Save" %></p>
diff --git a/plugins/mezuro/views/mezuro_plugin_reading/edit.html.erb b/plugins/mezuro/views/mezuro_plugin_reading/edit.html.erb
index 11e23b3..e5f5771 100644
--- a/plugins/mezuro/views/mezuro_plugin_reading/edit.html.erb
+++ b/plugins/mezuro/views/mezuro_plugin_reading/edit.html.erb
@@ -3,19 +3,6 @@
 <h2><%= link_to("#{@reading_group_content.name} Reading Group", @reading_group_content.view_url) %></h2>
 
 <% form_for :reading, :url => {:action =>"save", :controller => "mezuro_plugin_reading"},  :method => :get do |f| %>
-  <%= hidden_field_tag :id, @reading_group_content.id %>
-  
   <%= f.hidden_field :id %>
-  <%= required labelled_form_field _('label:'), f.text_field(:label) %> 
-
-  <%= required labelled_form_field _('grade:'),
-  f.text_field(:grade) %>
-  
-  <%= required labelled_form_field _('color:'),
-  colorpicker_field(:reading, :color) %>Click in the field to change Color
-  
-  <p>
-    <%= f.submit "Add" %>
-  </p>
-
+  <%= render :partial => "form", :locals => {:f => f} %>
 <% end %>
diff --git a/plugins/mezuro/views/mezuro_plugin_reading/new.html.erb b/plugins/mezuro/views/mezuro_plugin_reading/new.html.erb
index 9033052..e2b4d4c 100644
--- a/plugins/mezuro/views/mezuro_plugin_reading/new.html.erb
+++ b/plugins/mezuro/views/mezuro_plugin_reading/new.html.erb
@@ -3,18 +3,5 @@
 <h2><%= link_to("#{@reading_group_content.name} Reading Group", @reading_group_content.view_url) %></h2>
 
 <% form_for :reading, :url => {:action =>"save", :controller => "mezuro_plugin_reading"},  :method => :get do |f| %>
-  <%= hidden_field_tag :id, @reading_group_content.id %>
-  
-  <%= required labelled_form_field _('label:'), f.text_field(:label) %> 
-
-  <%= required labelled_form_field _('grade:'),
-  f.text_field(:grade) %>
-  
-  <%= required labelled_form_field _('color:'),
-  colorpicker_field(:reading, :color) %>Click in the field to change Color
-  
-  <p>
-    <%= f.submit "Add" %>
-  </p>
-
+  <%= render :partial => "form", :locals => {:f => f} %>
 <% end %>
diff --git a/plugins/mezuro/views/mezuro_plugin_repository/_form.html.erb b/plugins/mezuro/views/mezuro_plugin_repository/_form.html.erb
new file mode 100644
index 0000000..5d72b5e
--- /dev/null
+++ b/plugins/mezuro/views/mezuro_plugin_repository/_form.html.erb
@@ -0,0 +1,28 @@
+<h2><%= link_to("#{@project_content.name} Project", @project_content.view_url) %></h2>
+
+<% form_for :repository, :url => {:action =>"save", :controller => "mezuro_plugin_repository"},  :method => :get do |f| %>
+  <%= f.hidden_field :id %>
+  <%= hidden_field_tag :id, @project_content.id %>
+
+  <%= required labelled_form_field _('Name'), f.text_field(:name) %> 
+
+  <%= labelled_form_field _("Description"), f.text_field(:description) %>
+
+  <%= required labelled_form_field _('License'),
+  f.select(:license, MezuroPlugin::Helpers::ContentViewerHelper.license_options) %>
+
+  <%= required labelled_form_field _('Process Period'),
+  f.select(:process_period, MezuroPlugin::Helpers::ContentViewerHelper.periodicity_options) %>
+
+  <%= required labelled_form_field _('Type'),
+  f.select(:type, @repository_types) %>
+
+  <%= required labelled_form_field _('Address'),
+  f.text_field(:address) %>
+
+  <%= required labelled_form_field _('Configuration'),
+  f.select(:configuration_id, @configuration_select) %>
+
+  <p> <%= f.submit "Add" %> </p>
+
+<% end %>
diff --git a/plugins/mezuro/views/mezuro_plugin_repository/edit.html.erb b/plugins/mezuro/views/mezuro_plugin_repository/edit.html.erb
index 45c808b..2872e82 100644
--- a/plugins/mezuro/views/mezuro_plugin_repository/edit.html.erb
+++ b/plugins/mezuro/views/mezuro_plugin_repository/edit.html.erb
@@ -1,28 +1 @@
-<h2><%= link_to("#{@project_content.name} Project", @project_content.view_url) %></h2>
-
-<% form_for :repository, :url => {:action =>"save", :controller => "mezuro_plugin_repository"},  :method => :get do |f| %>
-  <%= hidden_field_tag :id, @project_content.id %>
-
-  <%= f.hidden_field :id%>
-  <%= required labelled_form_field _('Name:'), f.text_field(:name) %> 
-
-  <%= labelled_form_field _("Description:"), f.text_field(:description) %>
-
-  <%= required labelled_form_field _('License'),
-  f.select(:license, MezuroPlugin::Helpers::ContentViewerHelper.license_options, :selected => @repository.license) %>
-
-  <%= required labelled_form_field _('Process Period'),
-  f.select(:process_period, MezuroPlugin::Helpers::ContentViewerHelper.periodicity_options, :selected => @repository.process_period.to_i) %>
-
-  <%= required labelled_form_field _('Type'),
-  f.select(:type, @repository_types, :selected => @repository.type) %>
-
-  <%= required labelled_form_field _('Address'),
-  f.text_field(:address) %>
-
-  <%= required labelled_form_field _('Configuration'),
-  f.select(:configuration_id, @configuration_select, :selected => @repository.configuration_id.to_i) %>
-
-  <p> <%= f.submit "Add" %> </p>
-
-<% end %>
+<%= render :partial => "form" %>
diff --git a/plugins/mezuro/views/mezuro_plugin_repository/new.html.erb b/plugins/mezuro/views/mezuro_plugin_repository/new.html.erb
index b082210..2872e82 100644
--- a/plugins/mezuro/views/mezuro_plugin_repository/new.html.erb
+++ b/plugins/mezuro/views/mezuro_plugin_repository/new.html.erb
@@ -1,27 +1 @@
-<h2><%= link_to("#{@project_content.name} Project", @project_content.view_url) %></h2>
-
-<% form_for :repository, :url => {:action =>"save", :controller => "mezuro_plugin_repository"},  :method => :get do |f| %>
-  <%= hidden_field_tag :id, @project_content.id %>
-  
-  <%= required labelled_form_field _('Name:'), f.text_field(:name) %> 
-
-  <%= labelled_form_field _('Description'), f.text_field(:description) %>
-  
-  <%= required labelled_form_field _('License'),
-  f.select(:license, MezuroPlugin::Helpers::ContentViewerHelper.license_options) %>
-
-  <%= required labelled_form_field _('Process Period'),
-  f.select(:process_period, MezuroPlugin::Helpers::ContentViewerHelper.periodicity_options ) %>
-  
-  <%= required labelled_form_field _('Type'),
-  f.select(:type, @repository_types) %>
-  
-  <%= required labelled_form_field _('Address'),
-  f.text_field(:address) %>
-
-  <%= required labelled_form_field _('Configuration'),
-  f.select(:configuration_id, @configuration_select) %>
-
-  <p> <%= f.submit "Add" %> </p>
-
-<% end %>
+<%= render :partial => "form" %>
--
libgit2 0.21.2