diff --git a/plugins/mezuro/views/content_viewer/_metric_configuration_form.rhtml b/plugins/mezuro/views/content_viewer/_metric_configuration_form.rhtml
new file mode 100644
index 0000000..a6cf154
--- /dev/null
+++ b/plugins/mezuro/views/content_viewer/_metric_configuration_form.rhtml
@@ -0,0 +1,41 @@
+<% form_for :metric_configuration, :url => {:action =>"update_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| %>
+  
+    <% @metric.language.each do |language| %>
+      <%= m.hidden_field :language, :multiple => true, :value => language %>
+    <% end %>
+    
+    <%= m.hidden_field "scope", :value => @metric.scope %>
+    <p>
+      <b><%= m.label :origin, "Collector Name:" %></b>
+      <%= @metric.origin %>
+      <%= m.hidden_field "origin", :value => @metric.origin %>
+    </p>
+    <p>
+      <b><%= m.label :metric_name, "Metric Name:" %></b>
+      <%= @metric.name %>
+      <%= m.hidden_field "name", :value => @metric.name %>
+    </p>
+  <% end %>
+  <p>
+    <b><%= f.label :code, "Code:" %></b>
+    <%= @metric_configuration.code %>
+    <%= f.hidden_field "code", :value => @metric_configuration.code %>
+  </p>
+  <p>
+    <b><%= f.label :aggregation_form, "Aggregation Form:" %></b>
+    <%= f.select :aggregation_form, [["Average","AVERAGE"], ["Median", "MEDIAN"], ["Maximum", "MAXIMUM"], ["Minimum", "MINIMUM"], 
+    ["Count", "COUNT"], ["Standard Deviation", "STANDARD_DEVIATION"]] %>
+  </p>
+  <p>
+    <b><%= f.label :weight, "Weight:" %></b>
+    <%= f.text_field "weight", :value => @metric_configuration.weight %>
+  </p>
+
+  <p>
+    <%= f.submit "Save" %>
+  </p>
+<% end %>
diff --git a/plugins/mezuro/views/content_viewer/_metric_configuration_view.rhtml b/plugins/mezuro/views/content_viewer/_metric_configuration_view.rhtml
new file mode 100644
index 0000000..658db5b
--- /dev/null
+++ b/plugins/mezuro/views/content_viewer/_metric_configuration_view.rhtml
@@ -0,0 +1,15 @@
+<p> 
+  <b>Collector Name:</b> <%= @metric.origin %>
+</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_metric_configuration.html.erb b/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_metric_configuration.html.erb
index 91e3175..0609473 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
@@ -4,54 +4,14 @@
 
 <h2><%= @configuration_content.name %> Configuration</h2>
 
-<% form_for :metric_configuration, :url => {:action =>"update_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| %>
-  
-    <% @metric.language.each do |language| %>
-      <%= m.hidden_field :language, :multiple => true, :value => language %>
-    <% end %>
-    
-    <%= m.hidden_field "scope", :value => @metric.scope %>
-    <p>
-      <%= m.label :origin, "Collector Name:" %>
-      <%= @metric.origin %>
-      <%= m.hidden_field "origin", :value => @metric.origin %>
-    </p>
-    <p>
-      <%= m.label :metric_name, "Metric Name:" %>
-      <%= @metric.name %>
-      <%= m.hidden_field "name", :value => @metric.name %>
-    </p>
-    <!--<p>-->    
-      <% m.label :description, "Description:" %>
-      <% @metric.description %>
-      <% m.hidden_field "description", :value => @metric.description %>
-    <!--</p>-->
-  <% end %>
-  <p>
-    <%= f.label :code, "Code:" %>
-    <%= @metric_configuration.code %>
-    <%= f.hidden_field "code", :value => @metric_configuration.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", :value => @metric_configuration.weight %>
-  </p>
+<% owner = (not user.nil?) && user.id == @profile.id %>
 
-  <p>
-    <%= f.submit "Save" %>
-  </p>
+<% if owner %>
+  <%=  render :partial => "content_viewer/metric_configuration_form" %>
+<% else %>
+  <%=  render :partial => "content_viewer/metric_configuration_view" %>
 <% end %>
 
-
 <h5> Ranges </h5><br/>
 
 <table id="ranges">
@@ -83,6 +43,8 @@
 </table>
 
 <br/>
-<%= link_to_remote "New Range", :url => {:action =>"new_range", :controller => "mezuro_plugin_range", :id => @configuration_content.id, :metric_name => @metric.name} %>
+<% if owner %>
+  <%= link_to_remote "New Range", :url => {:action =>"new_range", :controller => "mezuro_plugin_range", :id => @configuration_content.id, :metric_name => @metric.name} %>
+<% end %>
 <div id="range_form" style="display:none"></div>
 
diff --git a/plugins/mezuro/views/mezuro_plugin_range/_range.html.erb b/plugins/mezuro/views/mezuro_plugin_range/_range.html.erb
index 97fbd52..a6d3b26 100644
--- a/plugins/mezuro/views/mezuro_plugin_range/_range.html.erb
+++ b/plugins/mezuro/views/mezuro_plugin_range/_range.html.erb
@@ -12,6 +12,13 @@
     <%=range.grade%>
   </td>
   <td bgcolor="#<%= range.color[2..-1] %>"></td>
-  <td><%= link_to_remote "Edit", :url => {:action =>"edit_range", :controller => "mezuro_plugin_range", :id => params[:id], :metric_name => params[:metric_name], :beginning_id => range.beginning} %></td>
-    <td><%= link_to "Remove", :action =>"remove_range", :controller => "mezuro_plugin_range", :id => params[:id], :metric_name => params[:metric_name], :beginning_id => range.beginning %></td>
+  <% if (not user.nil?) && user.id == @profile.id %>
+  <td><%= link_to_remote "Edit", :url => {:action =>"edit_range", :controller => "mezuro_plugin_range", :id => params[:id], :metric_name => params[:metric_name], :beginning_id => range.beginning} %>
+  </td>
+    <td><%= link_to "Remove", :action =>"remove_range", :controller => "mezuro_plugin_range", :id => params[:id], :metric_name => params[:metric_name], :beginning_id => range.beginning %>
+    </td>
+  <% else %>
+    <td></td>
+    <td></td>
+  <% end %>
 </tr>
diff --git a/plugins/mezuro/views/mezuro_plugin_range/_range_form.html.erb b/plugins/mezuro/views/mezuro_plugin_range/_range_form.html.erb
index 787dfea..f17d7f1 100644
--- a/plugins/mezuro/views/mezuro_plugin_range/_range_form.html.erb
+++ b/plugins/mezuro/views/mezuro_plugin_range/_range_form.html.erb
@@ -14,7 +14,7 @@
       <%= f.label :beginning, "(*) Beginning:" %>
     </td>
     <td>
-      <%= f.text_field :beginning, :value => @range.beginning , :id => 'beginning', :value => "" %>&nbsp;<%= link_to('-&#8734', 'javascript:void(0)', :onClick => "jQuery( '#beginning' ).val('-INF');") %>
+      <%= f.text_field :beginning, :value => @range.beginning , :id => 'beginning' %>&nbsp;<%= link_to('-&#8734', 'javascript:void(0)', :onClick => "jQuery( '#beginning' ).val('-INF');") %>
     </td>
   </tr>
   <tr>
--
libgit2 0.21.2