diff --git a/plugins/mezuro/lib/kalibro/client/base_tool_client.rb b/plugins/mezuro/lib/kalibro/client/base_tool_client.rb
index dd6ec79..b9fbfbe 100644
--- a/plugins/mezuro/lib/kalibro/client/base_tool_client.rb
+++ b/plugins/mezuro/lib/kalibro/client/base_tool_client.rb
@@ -11,7 +11,6 @@ class Kalibro::Client::BaseToolClient
   def base_tool(name)
     hash = @port.request(:get_base_tool, {:base_tool_name => name})[:base_tool]
     Kalibro::Entities::BaseTool.from_hash(hash)
-    #FIXME dando erro
   end
 
 end
diff --git a/plugins/mezuro/lib/kalibro/client/metrics_client.rb b/plugins/mezuro/lib/kalibro/client/metrics_client.rb
deleted file mode 100644
index f854aca..0000000
--- a/plugins/mezuro/lib/kalibro/client/metrics_client.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class Kalibro::Client::MetricsClient
-
-  def self.all_metrics
-    [Kalibro::Entities::Metric.new("LOC", "class", "Lines of code", 1), 
-    Kalibro::Entities::Metric.new("LCOM", "class", "Lack of cohesion", 2)]
-  end
-
-end
diff --git a/plugins/mezuro/lib/mezuro_plugin/configuration_content.rb b/plugins/mezuro/lib/mezuro_plugin/configuration_content.rb
index 48cdacf..c42bed3 100644
--- a/plugins/mezuro/lib/mezuro_plugin/configuration_content.rb
+++ b/plugins/mezuro/lib/mezuro_plugin/configuration_content.rb
@@ -1,7 +1,5 @@
 class MezuroPlugin::ConfigurationContent < Article
 
-  attr_accessor :metric_ids
-
   def self.short_description
     'Kalibro configuration'
   end
diff --git a/plugins/mezuro/test/unit/mezuro_plugin/configuration_content_test.rb b/plugins/mezuro/test/unit/mezuro_plugin/configuration_content_test.rb
index 174b968..08583f8 100644
--- a/plugins/mezuro/test/unit/mezuro_plugin/configuration_content_test.rb
+++ b/plugins/mezuro/test/unit/mezuro_plugin/configuration_content_test.rb
@@ -23,11 +23,6 @@ class ConfigurationContentTest < ActiveSupport::TestCase
     assert_equal 'Sets of thresholds to interpret metrics', MezuroPlugin::ConfigurationContent.description
   end
 
-  should 'accept metric_ids' do
-    @content.metric_ids = [1,5]
-    assert_equal @content.metric_ids, [1,5]
-  end
-
   should 'have an html view' do
     assert_not_nil @content.to_html
   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 f0cad2e..5ff2ab4 100644
--- a/plugins/mezuro/views/cms/mezuro_plugin/_configuration_content.html.erb
+++ b/plugins/mezuro/views/cms/mezuro_plugin/_configuration_content.html.erb
@@ -1,12 +1,12 @@
 <h1> <%= _(MezuroPlugin::ConfigurationContent.short_description) %> </h1>
 
 <%
-  begin
-    @configuration = @article.title.nil? ? nil : Kalibro::Client::ConfigurationClient.new.configuration(@article.title)
-  rescue
-    @configuration = nil
-  end 
-  %>
+begin
+  @configuration = @article.title.nil? ? nil : Kalibro::Client::ConfigurationClient.new.configuration(@article.title)
+rescue
+  @configuration = nil
+end 
+%>
 
 <%= error_messages_for 'kalibro_configuration' %>
 
@@ -20,13 +20,19 @@
 <%= f.text_field :description %><br/>
 
 <h3> Metrics </h3>
-<% @tool_names = Kalibro::Client::BaseToolClient.new
-@tool_names.base_tool_names.each do |collector_name|
-  @collector = @tool_names.base_tool(collector_name)
-  #FIXME dando erro
-  @collector.supported_metrics.each do |metric| %>
-    <div class="metric">
-      <%= label_tag "#{metric.name}" %>
-    </div>
-  <% end
-end %>
+<table>
+  <% @tool_names = Kalibro::Client::BaseToolClient.new
+  @tool_names.base_tool_names.each do |collector_name|
+    @collector = @tool_names.base_tool(collector_name)
+    @collector.supported_metrics.each do |metric| %>
+
+      <tr class="metric" title="<%= metric.description %>">
+        <td>
+          <%= check_box_tag metric.name, metric.name, true %>
+          <%= label_tag metric.name %>
+        </td>
+      </tr>
+
+    <% end %>
+  </table>
+<% end %>
--
libgit2 0.21.2