diff --git a/plugins/mezuro/views/mezuro_plugin_repository/edit.html.erb b/plugins/mezuro/views/mezuro_plugin_repository/edit.html.erb
index a534aed..e7246e4 100644
--- a/plugins/mezuro/views/mezuro_plugin_repository/edit.html.erb
+++ b/plugins/mezuro/views/mezuro_plugin_repository/edit.html.erb
@@ -4,39 +4,29 @@
   <%= hidden_field_tag :id, @project_content.id %>
 
   <%= f.hidden_field :id%>
-  <p>
-    <%= f.label :name, "Name:" %>
-    <%= f.text_field :name %>
-  </p>
-  <p>
-    <%= f.label :description, "Description:" %>
-    <%= f.text_field :description %>
-  </p>
+  <%= required labelled_form_field _('Name:'), f.text_field(:name) %> 
 
-  <p>
-    <%= required labelled_form_field _('License'),
-    f.select(:license, MezuroPlugin::Helpers::ContentViewerHelper.license_options) %><br/>
-  </p>
+  <div class="formfieldline">
+    <%= f.label :description, "Description:", :class => 'formlabel' %>
+    <div class="formfield type-text">  
+      <%= f.text_field :description %>
+    </div>
+  </div>
 
-  <p>
-    <%= f.label :process_period, "Process Period:" %>
-    <%= f.select(:process_period, MezuroPlugin::Helpers::ContentViewerHelper.periodicity_options, :selected => @repository.process_period.to_i) %>
-  </p>
+  <%= required labelled_form_field _('License'),
+  f.select(:license, MezuroPlugin::Helpers::ContentViewerHelper.license_options, :selected => @repository.license) %>
 
-  <p>
-    <%= f.label :type, "Type:" %>
-    <%= f.select :type, @repository_types%>
-  </p>
+  <%= required labelled_form_field _('Process Period'),
+  f.select(:process_period, MezuroPlugin::Helpers::ContentViewerHelper.periodicity_options, :selected => @repository.process_period.to_i) %>
 
-  <p>
-    <%= f.label :address, "Address:" %>
-    <%= f.text_field :address%>
-  </p>
+  <%= required labelled_form_field _('Type'),
+  f.select(:type, @repository_types, :selected => @repository.type) %>
 
-  <p>
-    <%= f.label :configuration_id, "Configuration:" %>
-    <%= f.select :configuration_id, @configuration_select, :selected => @repository.configuration_id.to_i %>
-  </p>
+  <%= 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" %>
diff --git a/plugins/mezuro/views/mezuro_plugin_repository/new.html.erb b/plugins/mezuro/views/mezuro_plugin_repository/new.html.erb
index 859b903..c81d0fe 100644
--- a/plugins/mezuro/views/mezuro_plugin_repository/new.html.erb
+++ b/plugins/mezuro/views/mezuro_plugin_repository/new.html.erb
@@ -3,36 +3,29 @@
 <% form_for :repository, :url => {:action =>"create", :controller => "mezuro_plugin_repository"},  :method => :get do |f| %>
   <%= hidden_field_tag :id, @project_content.id %>
   
-  <p>
-    <%= f.label :name, "Name:" %>
-    <%= f.text_field :name %>
-  </p>
-  <p>
-    <%= f.label :description, "Description:" %>
-    <%= f.text_field :description %>
-  </p>
+  <%= required labelled_form_field _('Name:'), f.text_field(:name) %> 
+
+  <div class="formfieldline">
+    <%= f.label :description, "Description:", :class => 'formlabel' %>
+    <div class="formfield type-text">  
+      <%= f.text_field :description %>
+    </div>
+  </div>
   
   <%= required labelled_form_field _('License'),
-  f.select(:license, MezuroPlugin::Helpers::ContentViewerHelper.license_options) %><br/>
-  <p>
-  
-  <p>
-    <%= f.label :process_period, "Process Period:" %>
-    <%= f.select(:process_period, MezuroPlugin::Helpers::ContentViewerHelper.periodicity_options ) %>
-  </p>
-    <%= f.label :type, "Type:" %>
-    <%= f.select :type, @repository_types %>
-  </p>
+  f.select(:license, MezuroPlugin::Helpers::ContentViewerHelper.license_options) %>
+
+  <%= required labelled_form_field _('Process Period'),
+  f.select(:process_period, MezuroPlugin::Helpers::ContentViewerHelper.periodicity_options ) %>
   
-  <p>
-    <%= f.label :address, "Address:" %>
-    <%= f.text_field :address %>
-  </p>
+  <%= required labelled_form_field _('Type'),
+  f.select(:type, @repository_types) %>
   
-  </p>
-    <%= f.label :configuration_id, "Configuration:" %>
-    <%= f.select :configuration_id, @configuration_select %>
-  </p>
+  <%= required labelled_form_field _('Address'),
+  f.text_field(:address) %>
+
+  <%= required labelled_form_field _('Configuration'),
+  f.select(:configuration_id, @configuration_select) %>
 
   <p>
     <%= f.submit "Add" %>
--
libgit2 0.21.2