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 c30556b..73a7b34 100644
--- a/plugins/mezuro/controllers/myprofile/mezuro_plugin_metric_configuration_controller.rb
+++ b/plugins/mezuro/controllers/myprofile/mezuro_plugin_metric_configuration_controller.rb
@@ -34,73 +34,64 @@ class MezuroPluginMetricConfigurationController < MezuroPluginMyprofileControlle
     @metric = @metric_configuration.metric
     @reading_group_names_and_ids = reading_group_names_and_ids
   end
-=begin
-  def new_compound_metric_configuration
-    @configuration_content = profile.articles.find(params[:id])
-    @metric_configurations = @configuration_content.metric_configurations
-    if configuration_content_has_errors?
-      redirect_to_error_page @configuration_content.errors[:base]
-    end
-  end
-
 
-  def edit_compound_metric_configuration
+  def update
     @configuration_content = profile.articles.find(params[:id])
-    @metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(@configuration_content.name, params[:metric_name])
-    @metric_configurations = @configuration_content.metric_configurations
-    @metric = @metric_configuration.metric
-  end
-
-
-  def create_compound_metric_configuration
-    id = params[:id]
-    metric_name = params[:metric_configuration][:metric][:name]
-    metric_configuration = Kalibro::MetricConfiguration.new(params[:metric_configuration])
-    metric_configuration.save
+    configuration_id = @configuration_content.configuration_id
+    metric_configurations = Kalibro::MetricConfiguration.metric_configurations_of(configuration_id)
+    metric_configuration = find_metric_configuration(metric_configurations, params[:metric_configuration][:id].to_i)
+    metric_configuration.update_attributes params[:metric_configuration]
     if metric_configuration_has_errors? metric_configuration
       redirect_to_error_page metric_configuration.errors[0].message
     else
-      redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/metric_configuration/edit_compound_metric_configuration?id=#{id}&metric_name=#{metric_name.gsub(/\s/, '+')}"
+      redirect_to "/#{profile.identifier}/#{@configuration_content.slug}"
     end
   end
 
-  def update_metric_configuration
-    @configuration_content = profile.articles.find(params[:id])
-    metric_name = params[:metric_configuration][:metric][:name]
-    metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(@configuration_content.name, metric_name)
-    metric_configuration.update_attributes params[:metric_configuration]
+  def remove
+    configuration_content = profile.articles.find(params[:id])
+    configuration_id = configuration_content.configuration_id
+    metric_configurations = Kalibro::MetricConfiguration.metric_configurations_of(configuration_id)
+    metric_configuration = find_metric_configuration(metric_configurations, params[:metric_configuration_id].to_i)
+    metric_configuration.destroy
     if metric_configuration_has_errors? metric_configuration
       redirect_to_error_page metric_configuration.errors[0].message
     else
-      redirect_to "/#{profile.identifier}/#{@configuration_content.slug}"
+      redirect_to "/#{profile.identifier}/#{configuration_content.slug}"
     end
   end
-
-  def update_compound_metric_configuration
+  
+  def new_compound
     @configuration_content = profile.articles.find(params[:id])
-    metric_name = params[:metric_configuration][:metric][:name]
-    metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(@configuration_content.name, metric_name)
-    metric_configuration.update_attributes params[:metric_configuration]
-    if metric_configuration_has_errors? metric_configuration
-      redirect_to_error_page metric_configuration.errors[0].message
-    else
-      redirect_to "/#{profile.identifier}/#{@configuration_content.slug}"
+    @metric_configurations = @configuration_content.metric_configurations
+    @reading_group_names_and_ids = reading_group_names_and_ids 
+    if configuration_content_has_errors?
+      redirect_to_error_page @configuration_content.errors[:base]
     end
   end
 
-  def remove_metric_configuration
-    configuration_content = profile.articles.find(params[:id])
-    metric_name = params[:metric_name]
-    metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(configuration_content.name, metric_name)
-    metric_configuration.destroy
+  def create_compound
+    metric_configuration = Kalibro::MetricConfiguration.new(params[:metric_configuration])
+    metric_configuration.save
+
     if metric_configuration_has_errors? metric_configuration
       redirect_to_error_page metric_configuration.errors[0].message
     else
-      redirect_to "/#{profile.identifier}/#{configuration_content.slug}"
+      id = params[:id]
+      redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/metric_configuration/edit_compound?id=#{id}&metric_configuration_id=#{metric_configuration.id}"
     end
   end
-=end 
-  
+
+  def edit_compound    
+    @configuration_content = profile.articles.find(params[:id])
+    configuration_id = @configuration_content.configuration_id
+    metric_configurations = Kalibro::MetricConfiguration.metric_configurations_of(configuration_id)
+    @metric_configuration = find_metric_configuration(metric_configurations, params[:metric_configuration_id].to_i)
+    @metric = @metric_configuration.metric
+    @reading_group_names_and_ids = reading_group_names_and_ids
+    @metric_configurations = metric_configurations
+  end
+
   private
   
   def find_metric_configuration (metric_configurations, metric_configuration_id)
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 72cbd7a..c6619d6 100644
--- a/plugins/mezuro/lib/mezuro_plugin/helpers/content_viewer_helper.rb
+++ b/plugins/mezuro/lib/mezuro_plugin/helpers/content_viewer_helper.rb
@@ -57,6 +57,10 @@ class MezuroPlugin::Helpers::ContentViewerHelper
       ["Count", "COUNT"], ["Standard Deviation", "STANDARD_DEVIATION"]]
   end
 
+  def self.scope_options
+    [["Class", "CLASS"]]
+  end
+
   private
 
   def self.discretize_array(array)
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 34d5d23..1619b84 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
@@ -12,7 +12,7 @@ class MezuroPluginMetricConfigurationControllerTest < ActionController::TestCase
     @controller = MezuroPluginMetricConfigurationController.new
     @request = ActionController::TestRequest.new
     @response = ActionController::TestResponse.new
-    @profile = fast_create(Community)
+    @profile = fast_create(Community) #FIXME Should be a person, not a community
 
     @configuration = ConfigurationFixtures.configuration
     @created_configuration = ConfigurationFixtures.created_configuration
@@ -34,8 +34,8 @@ class MezuroPluginMetricConfigurationControllerTest < ActionController::TestCase
     @metric_configuration = MetricConfigurationFixtures.amloc_metric_configuration
     @metric_configuration_hash = MetricConfigurationFixtures.amloc_metric_configuration_hash
     @created_metric_configuration = MetricConfigurationFixtures.created_metric_configuration
-=begin
     @compound_metric_configuration = MetricConfigurationFixtures.sc_metric_configuration
+=begin
     @compound_metric_configuration_hash = MetricConfigurationFixtures.sc_metric_configuration_hash
     
     
@@ -46,7 +46,7 @@ class MezuroPluginMetricConfigurationControllerTest < ActionController::TestCase
 =end
   end
   
-  should 'test choose metric' do
+  should 'choose metric' do
     Kalibro::BaseTool.expects(:all).returns([@base_tool])
     get :choose_metric, :profile => @profile.identifier, :id => @configuration_content.id
     assert_equal @configuration_content, assigns(:configuration_content)
@@ -54,7 +54,7 @@ class MezuroPluginMetricConfigurationControllerTest < ActionController::TestCase
     assert_response 200
   end
 
-  should 'test new native metric configuration' do
+  should 'initialize native' do
     Kalibro::BaseTool.expects(:find_by_name).with(@base_tool.name).returns(@base_tool)
     Kalibro::ReadingGroup.expects(:all).returns([@reading_group])
     get :new_native, :profile => @profile.identifier, :id => @configuration_content.id, :base_tool_name => @base_tool.name, :metric_name => @metric.name
@@ -65,7 +65,7 @@ class MezuroPluginMetricConfigurationControllerTest < ActionController::TestCase
     assert_response 200
   end
   
-  should 'test create native metric configuration' do
+  should 'create native' do
     #Kalibro::MetricConfiguration.expects(:new).returns(@created_metric_configuration) #FIXME need .with(some_hash).
     #@created_metric_configuration.expects(:save).returns(true)
 =begin
@@ -76,7 +76,7 @@ class MezuroPluginMetricConfigurationControllerTest < ActionController::TestCase
 =end
   end
   
-  should 'test edit native metric configuration' do
+  should 'edit native' do
     Kalibro::MetricConfiguration.expects(:metric_configurations_of).with(@configuration.id).returns([@metric_configuration])
     Kalibro::ReadingGroup.expects(:all).returns([@reading_group])
     get :edit_native, :profile => @profile.identifier, :id => @configuration_content.id, :metric_configuration_id => @metric_configuration.id
@@ -86,18 +86,31 @@ class MezuroPluginMetricConfigurationControllerTest < ActionController::TestCase
     assert_equal [[@reading_group.name,@reading_group.id]], assigns(:reading_group_names_and_ids)
     assert_response 200
   end
-=begin
-  should 'test new compound metric configuration' do
-    Kalibro::Configuration.expects(:request).with("Configuration", :get_configuration, {
-      :configuration_name => @configuration_content.name}).returns({:configuration => @configuration_hash})
-    get :new_compound_metric_configuration, :profile => @profile.identifier, :id => @configuration_content.id
+  
+  should 'initialize compound' do
+    Kalibro::ReadingGroup.expects(:all).returns([@reading_group])
+    get :new_compound, :profile => @profile.identifier, :id => @configuration_content.id
     assert_equal @configuration_content, assigns(:configuration_content)
-    assert_equal @configuration.metric_configuration[0].code, assigns(:metric_configurations)[0].code
+    #FIXME mock is not working. configuration_id is not being set.
+    #MezuroPlugin::ConfigurationContent.expects(:metric_configurations).returns([@compound_metric_configuration])
+    #assert_equal @compound_metric_configuration.code, assigns(:metric_configurations).first.code
+    assert_equal [[@reading_group.name,@reading_group.id]], assigns(:reading_group_names_and_ids)
     assert_response 200
   end
 
-  
-  should 'test edit compound metric configuration' do
+  should 'create compound' do
+=begin TODO ARRUMAR ESTE TESTE!!!
+    Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :save_metric_configuration, {
+      :metric_configuration => @compound_metric_configuration.to_hash,
+      :configuration_name => @compound_metric_configuration.configuration_name})
+    get :create_compound_metric_configuration, :profile => @profile.identifier, :id => @configuration_content.id, 
+      :metric_configuration => @compound_hash
+    assert_response 302
+=end
+  end
+
+  should 'edit compound' do
+=begin TODO ARRUMAR ESTE TESTE!!!
     Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :get_metric_configuration, {
       :configuration_name => @configuration_content.name,
       :metric_name => @compound_metric_configuration.metric.name}).returns({:metric_configuration => @compound_metric_configuration_hash})
@@ -111,19 +124,11 @@ class MezuroPluginMetricConfigurationControllerTest < ActionController::TestCase
     assert_equal @compound_metric_configuration.metric.name, assigns(:metric).name
     assert_equal @configuration.metric_configuration[0].code, assigns(:metric_configurations)[0].code
     assert_response 200
+=end
   end
   
-  
-  should 'test compound metric creation' do
-    Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :save_metric_configuration, {
-      :metric_configuration => @compound_metric_configuration.to_hash,
-      :configuration_name => @compound_metric_configuration.configuration_name})
-    get :create_compound_metric_configuration, :profile => @profile.identifier, :id => @configuration_content.id, 
-      :metric_configuration => @compound_hash
-    assert_response 302
-  end
-
-  should 'test update native metric configuration' do
+  should 'update' do
+=begin TODO ARRUMAR ESTE TESTE!!!
     Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :get_metric_configuration, {
       :configuration_name => @configuration_content.name,
       :metric_name => @metric_configuration.metric.name}).returns({:metric_configuration => @metric_configuration_hash})
@@ -134,30 +139,15 @@ class MezuroPluginMetricConfigurationControllerTest < ActionController::TestCase
       :metric_configuration => @native_hash
     assert_equal @configuration_content, assigns(:configuration_content)
     assert_response 302
+=end
   end
-
-  should 'test update compound metric configuration' do
-    Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :get_metric_configuration, {
-      :configuration_name => @configuration_content.name,
-      :metric_name => @compound_metric_configuration.metric.name}).returns({:metric_configuration => @compound_metric_configuration_hash})
-    Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :save_metric_configuration, {
-        :metric_configuration => @compound_metric_configuration.to_hash,
-        :configuration_name => @compound_metric_configuration.configuration_name})
-    get :update_compound_metric_configuration, :profile => @profile.identifier, :id => @configuration_content.id, 
-    :metric_configuration => @compound_hash
-    assert_equal @configuration_content, assigns(:configuration_content)
+  
+  should 'remove' do
+    Kalibro::MetricConfiguration.expects(:metric_configurations_of).with(@configuration.id).returns([@metric_configuration])
+    @metric_configuration.expects(:destroy).returns()
+    get :remove, :profile => @profile.identifier, :id => @configuration_content.id, :metric_configuration_id => @metric_configuration.id
     assert_response 302
   end
 
-  should 'test remove metric configuration' do
-    Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :get_metric_configuration, {
-      :configuration_name => @configuration_content.name,
-      :metric_name => @metric.name}).returns({:metric_configuration => @metric_configuration_hash})
-    Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :remove_metric_configuration, {
-        :metric_name => @metric.name,
-        :configuration_name => @metric_configuration.configuration_name})
-    get :remove_metric_configuration, :profile => @profile.identifier, :id => @configuration_content.id, :metric_name => @metric.name
-    assert_response 302
-  end
-=end
+
 end
diff --git a/plugins/mezuro/test/unit/mezuro_plugin/helpers/content_viewer_helper_test.rb b/plugins/mezuro/test/unit/mezuro_plugin/helpers/content_viewer_helper_test.rb
index a06585b..3fa7ea0 100644
--- a/plugins/mezuro/test/unit/mezuro_plugin/helpers/content_viewer_helper_test.rb
+++ b/plugins/mezuro/test/unit/mezuro_plugin/helpers/content_viewer_helper_test.rb
@@ -60,4 +60,8 @@ class ContentViewerHelperTest < ActiveSupport::TestCase
     ["Count", "COUNT"], ["Standard Deviation", "STANDARD_DEVIATION"]], @helper.aggregation_options
   end
 
+  should 'create scope options' do
+    assert_equal [["Class", "CLASS"]], @helper.scope_options
+  end
+
 end
diff --git a/plugins/mezuro/views/content_viewer/show_configuration.rhtml b/plugins/mezuro/views/content_viewer/show_configuration.rhtml
index 84efa3b..7b74740 100644
--- a/plugins/mezuro/views/content_viewer/show_configuration.rhtml
+++ b/plugins/mezuro/views/content_viewer/show_configuration.rhtml
@@ -44,7 +44,13 @@
     </tr>
     <% @configuration_content.metric_configurations.each do |metric_configuration| %>
       <tr class="metric">
-        <td><%= link_to metric_configuration.metric.name, :controller => "mezuro_plugin_metric_configuration", :action => "edit_native", 
+        <% if metric_configuration.metric.compound
+             edit_action = "edit_compound"
+           else
+             edit_action = "edit_native"
+           end
+        %>
+        <td><%= link_to metric_configuration.metric.name, :controller => "mezuro_plugin_metric_configuration", :action => edit_action, 
           						  :metric_configuration_id => metric_configuration.id, :id => @configuration_content.id, 
           						  :profile => @page.profile.identifier %></td>
         <% if metric_configuration.metric.compound %>
@@ -60,8 +66,8 @@
         <td><%= metric_configuration.weight %></td>
         <td><%= metric_configuration.aggregation_form %></td>
         <% if owner %>
-          <td><%= link_to "Remove", :controller => "mezuro_plugin_metric_configuration", :action => "remove_metric_configuration", 
-        						  :metric_name => metric_configuration.metric.name, :id => @configuration_content.id, 
+          <td><%= link_to "Remove", :controller => "mezuro_plugin_metric_configuration", :action => "remove", 
+        						  :metric_configuration_id => metric_configuration.id, :id => @configuration_content.id, 
         						  :profile => @page.profile.identifier %></td>
         <% end %>
       </tr>
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 d60fa57..393bf06 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,4 +1,4 @@
-<% form_for :metric_configuration, :url => {:action =>"update_native", :controller => "mezuro_plugin_metric_configuration"}, :method => :get do |f| %>
+<% 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, :value => @metric_configuration.id %>
@@ -6,6 +6,7 @@
   <%= 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 %>
@@ -17,12 +18,13 @@
   <%= required labelled_form_field _('Code:'), f.text_field(:code) %>
 
   <%= required labelled_form_field _('Aggregation Form:'),
-  f.select(:aggregation_form, MezuroPlugin::Helpers::ContentViewerHelper.aggregation_options) %>
+  f.select(:aggregation_form, MezuroPlugin::Helpers::ContentViewerHelper.aggregation_options,
+      :selected => @metric_configuration.aggregation_form ) %>
 
   <%= 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) %>
+  f.select(:reading_group_id, @reading_group_names_and_ids, :selected => @metric_configuration.reading_group_id.to_i) %>
   
   <p>
     <%= f.submit "Save" %>
diff --git a/plugins/mezuro/views/mezuro_plugin_metric_configuration/choose_metric.html.erb b/plugins/mezuro/views/mezuro_plugin_metric_configuration/choose_metric.html.erb
index 0a75054..2a11812 100644
--- a/plugins/mezuro/views/mezuro_plugin_metric_configuration/choose_metric.html.erb
+++ b/plugins/mezuro/views/mezuro_plugin_metric_configuration/choose_metric.html.erb
@@ -1,6 +1,6 @@
 <h2><%= @configuration_content.name%> Configuration</h2>
 
-<%= link_to "New Compound Metric", :controller => "mezuro_plugin_metric_configuration", :action => "new_compound_metric_configuration",
+<%= link_to "New Compound Metric", :controller => "mezuro_plugin_metric_configuration", :action => "new_compound",
 								   :id => @configuration_content.id %>
 
 <h5>Base Tools:</h5>
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
new file mode 100644
index 0000000..7c135e5
--- /dev/null
+++ b/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_compound.html.erb
@@ -0,0 +1,69 @@
+<script src="/plugins/mezuro/javascripts/validations.js" type="text/javascript"></script>
+<script src="/javascripts/colorpicker.js" type="text/javascript"></script>
+<script src="/javascripts/colorpicker-noosfero.js" type="text/javascript"></script>
+
+<h2><%= @configuration_content.name %> Configuration</h2>
+
+<% 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, :value => @metric_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.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), :value => @metric_configuration.code %>
+  <%= required labelled_form_field _('Aggregation Form:'),
+      f.select(:aggregation_form, MezuroPlugin::Helpers::ContentViewerHelper.aggregation_options,
+      :selected => @metric_configuration.aggregation_form ) %>
+  <%= required labelled_form_field _('Weight:'), f.text_field(:weight), :value => @metric_configuration.weight %>
+  <%= required labelled_form_field _('Reading Group:'), f.select(:reading_group_id, @reading_group_names_and_ids,
+      :selected => @metric_configuration.reading_group_id.to_i) %>
+  
+  <p><%= f.submit "Save" %></p>
+  
+<% 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>
+  <% 
+  #if (@metric_configuration.ranges!=nil) 
+  #  @metric_configuration.ranges.each do |range| 
+  %>
+      <%= #render :partial => "mezuro_plugin_range/range", :locals => {:range => range, :id => @configuration_content.id, 
+          #:metric_name => @metric_configuration.metric.name} 
+  %>
+   <% #end
+  #end 
+  %>
+</table>
+
+<br/>
+<%= link_to_remote "New Range", :url => {:action =>"new_range", :controller => "mezuro_plugin_range", :id => @configuration_content.id, :metric_name => @metric.name} %>
+<div id="range_form" style="display:none"></div>
+<br/>
+<%= render :partial => "metric_codes", :locals => {:metric_configurations => @metric_configurations} %>
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
deleted file mode 100644
index 3c881e9..0000000
--- a/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_compound_metric_configuration.html.erb
+++ /dev/null
@@ -1,81 +0,0 @@
-<script src="/plugins/mezuro/javascripts/validations.js" type="text/javascript"></script>
-<script src="/javascripts/colorpicker.js" type="text/javascript"></script>
-<script src="/javascripts/colorpicker-noosfero.js" type="text/javascript"></script>
-
-<h2><%= @configuration_content.name %> Configuration</h2>
-
-<% form_for :metric_configuration, :url => {:action =>"update_compound_metric_configuration", :controller => "mezuro_plugin_metric_configuration"}, :method => :get do |f| %>
-  <%= hidden_field_tag :id, @configuration_content.id %>
-  <%= f.hidden_field :configuration_name, :value => @configuration_content.name %>
-
-  <p>
-    <%= "Metric Name:" + @metric.name %>   
-  </p>  
-  <% f.fields_for :metric do |m| %>
-    <%= m.hidden_field :name, :value => @metric.name %>
-    <p>
-      <%= m.label :description, "Description:" %>
-      <%= m.text_field "description", :value => @metric.description %>
-    </p>
-    <p>
-      <%= m.label :scope, "Scope:" %>
-      <%= m.select :scope, [["Class", "CLASS"]], :selected => @metric.scope %>
-    </p>
-    <p>
-      <%= m.label :script, "Script:" %>
-      <%= m.text_area "script", :value => @metric.script, :rows => 5 %>
-    </p>
-  <% end %>
-  <p>
-    <%= f.label :code, "Code:" %>
-    <%= f.text_field "code" %>
-  </p>
-  <p>
-    <%= f.label :aggregation_form, "Aggregation Form:" %>
-    <%= f.select :aggregation_form, [["Average","AVERAGE"], ["Median", "MEDIAN"], ["Maximum", "MAXIMUM"], ["Minimum", "MINIMUM"], 
-    ["Count", "COUNT"], ["Standard Deviation", "STANDARD_DEVIATION"]] %>
-  </p>
-  <p>
-    <%= f.label :weight, "Weight:" %>
-    <%= f.text_field :weight %>
-  </p>
-  <p>
-    <%= f.submit "Save" %>
-  </p>
-<% 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>
-  <% if (@metric_configuration.ranges!=nil) 
-    @metric_configuration.ranges.each do |range| %>
-      <%= render :partial => "mezuro_plugin_range/range", :locals => {:range => range, :id => @configuration_content.id, 
-          :metric_name => @metric_configuration.metric.name} %>
-    <% end
-  end %>
-</table>
-
-<br/>
-<%= link_to_remote "New Range", :url => {:action =>"new_range", :controller => "mezuro_plugin_range", :id => @configuration_content.id, :metric_name => @metric.name} %>
-<div id="range_form" style="display:none"></div>
-
-<br/>
-<%= render :partial => "metric_codes", :locals => {:metric_configurations => @metric_configurations} %>
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
new file mode 100644
index 0000000..bbf0b2b
--- /dev/null
+++ b/plugins/mezuro/views/mezuro_plugin_metric_configuration/new_compound.html.erb
@@ -0,0 +1,26 @@
+<h2><%= @configuration_content.name %> Configuration</h2>
+
+<% form_for :metric_configuration, :url => {:action =>"create_compound", :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>
+<% end %>
+
+<%= render :partial => "metric_codes", :locals => {:metric_configurations => @metric_configurations} %>
+
+
diff --git a/plugins/mezuro/views/mezuro_plugin_metric_configuration/new_compound_metric_configuration.html.erb b/plugins/mezuro/views/mezuro_plugin_metric_configuration/new_compound_metric_configuration.html.erb
deleted file mode 100644
index a10a57e..0000000
--- a/plugins/mezuro/views/mezuro_plugin_metric_configuration/new_compound_metric_configuration.html.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-<h2><%= @configuration_content.name %> Configuration</h2>
-
-<% form_for :metric_configuration, :url => {:action =>"create_compound_metric_configuration", 
-:controller => "mezuro_plugin_metric_configuration"}, :method => :get do |f| %>
-  <%= hidden_field_tag :id, @configuration_content.id %>
-  <%= f.hidden_field :configuration_name, :value => @configuration_content.name %>
-
-  <% f.fields_for :metric do |m| %>
-    <p>
-      <%= m.label :name, "Name:" %>
-      <%= m.text_field "name" %>
-    </p>
-    <p>
-      <%= m.label :description, "Description:" %>
-      <%= m.text_field "description" %>
-    </p>
-    <p>
-      <%= m.label :scope, "Scope:" %>
-      <%= m.select :scope, [["Class", "CLASS"]] %>
-    </p>
-    <p>
-      <%= m.label :script, "Script:" %>
-      <%= m.text_area "script", :rows => 5 %>
-    </p>
-  <% end %>
-  <p>
-    <%= f.label :code, "Code:" %>
-    <%= f.text_field "code" %>
-  </p>
-  <p>
-    <%= f.label :aggregation_form, "Aggregation Form:" %>
-    <%= f.select :aggregation_form, [["Average","AVERAGE"], ["Median", "MEDIAN"], ["Maximum", "MAXIMUM"], ["Minimum", "MINIMUM"], 
-    ["Count", "COUNT"], ["Standard Deviation", "STANDARD_DEVIATION"]] %>
-  </p>
-  <p>
-    <%= f.label :weight, "Weight:" %>
-    <%= f.text_field :weight %>
-  </p>
-  <p>
-    <%= f.submit "Add" %>
-  </p>
-<% 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 13f6cf8..dce726d 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
@@ -10,6 +10,7 @@
   <%= 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 %>
--
libgit2 0.21.2