diff --git a/views/_main_software_editor_extras.html.erb b/views/_main_software_editor_extras.html.erb
index 32a40e4..c3f1c3c 100644
--- a/views/_main_software_editor_extras.html.erb
+++ b/views/_main_software_editor_extras.html.erb
@@ -25,4 +25,8 @@
   <a id = "version_link" href="<%= context.profile.software_info.license_info.link %>" target="BLANK"> <%= context.profile.software_info.license_info.link %> </a>
 </div>
 
+<div class="formfieldline formfield type-text">
+  <%= label_tag "repository_url", _("Link to Repository: ") %>
+  <%= text_field_tag(:reository_url) %>
+</div>
 
diff --git a/views/_public_software_info.html.erb b/views/_public_software_info.html.erb
index c30ec8d..0acf778 100644
--- a/views/_public_software_info.html.erb
+++ b/views/_public_software_info.html.erb
@@ -1,252 +1,137 @@
-<%= javascript_include_tag "mpog-validations" %>
-
 <h1><%= _('Edit  software') %></h1>
 
-<% unless @errors.blank? %>
-<div class="errorExplanation" id="errorExplanation">
-  <h2> <%= _("Can`t edit software: #{@errors.length} errors") %> </h2>
-  <ul>
-  <% @errors.each do |error| %>
-    <li> <%= error %> </li>
-  <% end %>
-  </ul>
-</div>
-<% end %>
-
 <div>
-  <%= labelled_form_for :community, :html => { :multipart => true } do |f| %>
-
-    <%= required_fields_message %>
-
-    <%= required f.text_field(:name) %>
-
-    <%= fields_for @software_info do |swf| %>
-      <div class="formfield type-text">
-        <%= swf.label("acronym" ,_("Acronym"), :class=>"formlabel") %>
-        <%= swf.text_field(:acronym) %>
+  <div class="formfield type-text">
+        <%= label_tag("acronym" ,_("Acronym"), :class=>"formlabel") %>
+        <%= text_field_tag(:acronym) %>
       </div>
 
       <div class="formfieldline">
-        <%= swf.label _("Adherent to e-PING ?") %>
+        <%= label_tag _("Adherent to e-PING ?") %>
 
-        <%= swf.label "e_ping_true", "Yes" %>
-        <%= swf.radio_button(:e_ping,true)%>
-        <%= swf.label "e_ping_false", "No"%>
-        <%= swf.radio_button(:e_ping,false)%>
+        <%= label_tag "e_ping_true", "Yes" %>
+        <%= radio_button_tag(:e_ping,true)%>
+        <%= label_tag "e_ping_false", "No"%>
+        <%= radio_button_tag(:e_ping,false)%>
       </div>
 
       <div class="formfieldline">
-        <%= swf.label _("Adherent to e-MAG ?") %>
+        <%= label_tag _("Adherent to e-MAG ?") %>
 
-        <%= swf.label "e_mag_true", "Yes"%>
-        <%= swf.radio_button(:e_mag,true)%>
-        <%= swf.label "e_mag_false", "No"%>
-        <%= swf.radio_button(:e_mag,false)%>
+        <%= label_tag "e_mag_true", "Yes"%>
+        <%= radio_button_tag(:e_mag,true)%>
+        <%= label_tag "e_mag_false", "No"%>
+        <%= radio_button_tag(:e_mag,false)%>
       </div>
 
       <div class="formfieldline">
-        <%= swf.label _("Adherent to ICP-Brasil ?") %>
+        <%= label_tag _("Adherent to ICP-Brasil ?") %>
 
-        <%= swf.label "icp_brasil_true", "Yes"%>
-        <%= swf.radio_button(:icp_brasil,true)%>
-        <%= swf.label "icp_brasil_false", "No"%>
-        <%= swf.radio_button(:icp_brasil,false)%>
+        <%= label_tag "icp_brasil_true", "Yes"%>
+        <%= radio_button_tag(:icp_brasil,true)%>
+        <%= label_tag "icp_brasil_false", "No"%>
+        <%= radio_button_tag(:icp_brasil,false)%>
       </div>
 
       <div class="formfieldline">
-        <%= swf.label _("Adherent to e-ARQ ?") %>
+        <%= label_tag _("Adherent to e-ARQ ?") %>
 
-        <%= swf.label "e_arq_true", "Yes"%>
-        <%= swf.radio_button(:e_arq,true)%>
-        <%= swf.label "e_arq_false", "No"%>
-        <%= swf.radio_button(:e_arq,false)%>
+        <%= label_tag "e_arq_true", "Yes"%>
+        <%= radio_button_tag(:e_arq,true)%>
+        <%= label_tag "e_arq_false", "No"%>
+        <%= radio_button_tag(:e_arq,false)%>
       </div>
 
       <div class="formfieldline">
-        <%= swf.label _("Internacionalizable ?") %>
+        <%= label_tag _("Internacionalizable ?") %>
 
-        <%= swf.label "intern_true", "Yes" %>
-        <%= swf.radio_button(:intern,true)%>
-        <%= swf.label "intern_false", "No"%>
-        <%= swf.radio_button(:intern,false)%>
+        <%= label_tag "intern_true", "Yes" %>
+        <%= radio_button_tag(:intern,true)%>
+        <%= label_tag "intern_false", "No"%>
+        <%= radio_button_tag(:intern,false)%>
       <div class="formfieldline">
-        <%= swf.label "operating_platform", _("Operating Platform: ") %> <br />
-        <%= swf.text_area(:operating_platform, :class=>"expand-field") %>
+        <%= label_tag "operating_platform", _("Operating Platform: ") %> <br />
+        <%= text_area_tag :operating_platform %>
       </div>
 
       <div class="formfieldline">
-        <%= swf.label "objectives", _("Objectives: ")%><br />
-        <%= required swf.text_area(:objectives, :class=>"expand-field") %>
+        <%= label_tag "objectives", _("Objectives: ")%><br />
+        <%= text_area_tag :objectives %>
       </div>
 
       <div class="formfieldline">
-        <%= swf.label "features", _("Features: ")%><br />
-        <%= required swf.text_area(:features, :class=>"expand-field") %>
+        <%= label_tag "features", _("Features: ")%><br />
+        <%= text_area_tag :features %>
       </div>
 
-      <div class="formfieldline formfield type-text">
-        <%= swf.label "demonstration_url", _("Demonstration URL: ") %>
-        <%= swf.text_field(:demonstration_url) %>
-      </div>
-    <% end %>
-
-   <div class="formfieldline">
-      <%= content_tag('label', _('Fill in the search field to add offerers for this Software'), :id => "text-input-search-offerers") %>
-      <%= token_input_field_tag(:q, 'search-offerers', {:action => 'search_offerers'}, { :focus => true, :hint_text => _('Type in a search term for a person to be added as
-offerers'), :pre_populate => @tokenized_children}) %>
-    </div>
-
-  <div id='libraries_fields'>
-    <h4> <%= _("Libraries") %> </h4>
-    <%= render :partial => 'library_fields', :locals => { :f => f, :object_name => 'community', :profile => @community, :libraries => @list_libraries } %>
-  </div>
-  <br />
-
-  <div id='operating_system_fields'>
-    <h4> <%= _("Operating Systems") %> </h4>
-    <% if @list_operating_systems.blank? %>
-      <%= OperatingSystemHelper.operating_system_as_tables(nil, false).call %>
-    <% end %>
-    <%= render :partial => 'operating_system_fields', :locals => { :f => f, :object_name => 'community', :profile => @community, :operating_systems_fields => @list_operating_systems} %>
-  </div>
-  <br />
-
-  <%=  fields_for @license_info do |lcv| %>
-    <div class="formfieldline">
-      <h4> <%= lcv.label _("License Version: ") %> </h4>
-        <%= lcv.select(:version, LicenseInfo.all.map {|l| [l.version, l.version]}, {:selected=>1}, :onchange => "get_license_link('license_info_version')") %>
-
-      <h4> <%= _("License link") %> </h4>
-      <% LicenseHelper.getListLicenses.each do | license |  %>
-        <input type="hidden" id = "version_<%=license.id %>" value = "<%=license.link%>">
-      <% end %>
-      <a id = "version_link" href="<%= LicenseInfo.first.link %>" target="_BLANK"> <%=LicenseInfo.first.link %> </a>
-
-    </div>
-  <% end %>
-
-  <br />
-  <div id='programming_languages_fields'>
-    <h4> <%= _("Programming languages") %> </h4>
-    <% if @list_languages.blank? %>
-      <%= SoftwareLanguageHelper.language_as_tables(nil, false).call %>
-    <% end %>
-
-    <%= render :partial => 'language_fields', :locals => { :f => f, :object_name => 'community', :profile => @community, :languages => @list_languages } %>
-  </div>
-
-  <br />
-  <div id='database_fields'>
-    <h4> <%= _("Databases") %> </h4>
-    <% if @list_databases.blank? %>
-      <%= DatabaseHelper.database_as_tables(nil, true).call %>
-    <% end %>
-
-    <%= render :partial => 'database_fields', :locals => { :f => f, :object_name => 'community', :profile => @community, :database => @list_databases } %>
-  </div>
 
-  <%= fields_for @software_categories do |cv| %>
   <div id="software_categories_fields">
     <h4> <%= _("Software Categories:") %> </h4>
 
-    <%= cv.check_box :administration %>
-    <%= cv.label :administration, _("Administration") %><br />
+    <%= check_box_tag :administration %>
+    <%= label_tag :administration, _("Administration") %><br />
 
-    <%= cv.check_box :agriculture %>
-    <%= cv.label :agriculture, _("Agriculture") %><br />
+    <%= check_box_tag :agriculture %>
+    <%= label_tag :agriculture, _("Agriculture") %><br />
 
-    <%= cv.check_box :business_and_services %>
-    <%= cv.label :business_and_services, _("Business_and Services") %><br />
+    <%= check_box_tag :business_and_services %>
+    <%= label_tag :business_and_services, _("Business_and Services") %><br />
 
-    <%= cv.check_box :communication %>
-    <%= cv.label :communication, _("Communication") %><br />
+    <%= check_box_tag :communication %>
+    <%= label_tag :communication, _("Communication") %><br />
 
-    <%= cv.check_box :culture %>
-    <%= cv.label :culture, _("Culture") %><br />
+    <%= check_box_tag :culture %>
+    <%= label_tag :culture, _("Culture") %><br />
 
-    <%= cv.check_box :national_defense %>
-    <%= cv.label :national_defense, _("National Defense") %><br />
+    <%= check_box_tag :national_defense %>
+    <%= label_tag :national_defense, _("National Defense") %><br />
 
-    <%= cv.check_box :economy_and_finances %>
-    <%= cv.label :economy_and_finances, _("Economy and Finances") %><br />
+    <%= check_box_tag :economy_and_finances %>
+    <%= label_tag :economy_and_finances, _("Economy and Finances") %><br />
 
-    <%= cv.check_box :education %>
-    <%= cv.label :education, _("Education") %><br />
+    <%= check_box_tag :education %>
+    <%= label_tag :education, _("Education") %><br />
 
-    <%= cv.check_box :energy %>
-    <%= cv.label :energy, _("Energy") %><br />
+    <%= check_box_tag :energy %>
+    <%= label_tag :energy, _("Energy") %><br />
 
-    <%= cv.check_box :sports %>
-    <%= cv.label :sports, _("Sports") %><br />
+    <%= check_box_tag :sports %>
+    <%= label_tag :sports, _("Sports") %><br />
 
-    <%= cv.check_box :habitation %>
-    <%= cv.label :habitation, _("Habitation") %><br />
+    <%= check_box_tag :habitation %>
+    <%= label_tag :habitation, _("Habitation") %><br />
 
-    <%= cv.check_box :industry %>
-    <%= cv.label :industry, _("Industry") %><br />
+    <%= check_box_tag :industry %>
+    <%= label_tag :industry, _("Industry") %><br />
 
-    <%= cv.check_box :environment %>
-    <%= cv.label :environment, _("Environment") %><br />
+    <%= check_box_tag :environment %>
+    <%= label_tag :environment, _("Environment") %><br />
 
-    <%= cv.check_box :research_and_development %>
-    <%= cv.label :research_and_development, _("Research and Development") %><br />
+    <%= check_box_tag :research_and_development %>
+    <%= label_tag :research_and_development, _("Research and Development") %><br />
 
-    <%= cv.check_box :social_security %>
-    <%= cv.label :social_security, _("Social Security") %><br />
+    <%= check_box_tag :social_security %>
+    <%= label_tag :social_security, _("Social Security") %><br />
 
-    <%= cv.check_box :social_protection %>
-    <%= cv.label :social_protection, _("Social Protection") %><br />
+    <%= check_box_tag :social_protection %>
+    <%= label_tag :social_protection, _("Social Protection") %><br />
 
-    <%= cv.check_box :sanitation %>
-    <%= cv.label :sanitation, _("Sanitation") %><br />
+    <%= check_box_tag :sanitation %>
+    <%= label_tag :sanitation, _("Sanitation") %><br />
 
-    <%= cv.check_box :health %>
-    <%= cv.label :health, _("Health") %><br />
+    <%= check_box_tag :health %>
+    <%= label_tag :health, _("Health") %><br />
 
-    <%= cv.check_box :security_public_order %>
-    <%= cv.label :security_public_order, _("Security and Public Order") %><br />
+    <%= check_box_tag :security_public_order %>
+    <%= label_tag :security_public_order, _("Security and Public Order") %><br />
 
-    <%= cv.check_box :work %>
-    <%= cv.label :work, _("Work") %><br />
+    <%= check_box_tag :work %>
+    <%= label_tag :work, _("Work") %><br />
 
-    <%= cv.check_box :transportation %>
-    <%= cv.label :transportation, _("Transportation") %><br />
+    <%= check_box_tag :transportation %>
+    <%= label_tag :transportation, _("Transportation") %><br />
 
-    <%= cv.check_box :urbanism %>
-    <%= cv.label :urbanism, _("Urbanism") %><br />
+    <%= check_box_tag :urbanism %>
+    <%= label_tag :urbanism, _("Urbanism") %><br />
   </div>
-  <% end %>
-  <%= render :partial => 'shared/organization_custom_fields', :locals => { :f => f, :object_name => 'community', :profile => @community } %>
-
-    <%= f.fields_for :image_builder, @community.image do |i| %>
-      <%= file_field_or_thumbnail(_('Image:'), @community.image, i) %>
-    <% end %>
-
-    <div style='margin-bottom: 1em; margin-top: 1em;'>
-      <%= _('New members must be approved:')%>
-    </div>
-    <div style='margin-bottom: 0.5em' id='community-join-before'>
-      <%= radio_button 'community', 'closed', 'true', :style => 'float: left' %>
-      <div style='margin-left: 30px'>
-        <%= _('<strong>Before</strong> joining this group (a moderator has to accept the member in pending request before member can access the intranet and/or the website).') %>
-      </div>
-    </div>
-    <div id='community-join-after'>
-      <%= radio_button 'community', 'closed', 'false', :style => 'float: left' %>
-      <div style='margin-left: 30px'>
-        <%= _('<strong>After</strong> joining this group (a moderator can always desactivate access for users later).') %>
-      </div>
-    </div>
-
-    <%= template_options(:communities, 'community')%>
-
-    <%= hidden_field_tag('back_to', @back_to) %>
-
-    <% button_bar do %>
-      <%= submit_button(:save, _('Create')) %>
-      <%= button(:cancel, _('Cancel'), @back_to ) %>
-    <% end %>
-
-  <% end %>
-
 </div>
--
libgit2 0.21.2