diff --git a/app/views/enterprise_registration/basic_information.rhtml b/app/views/enterprise_registration/basic_information.rhtml
index 18d9624..31895e6 100644
--- a/app/views/enterprise_registration/basic_information.rhtml
+++ b/app/views/enterprise_registration/basic_information.rhtml
@@ -1,6 +1,6 @@
 <%= error_messages_for 'create_enterprise' %>
 
-<h2><%= _('Register enterprise') %></h2>
+<h1><%= _('Register enterprise') %></h1>
 
 
 <% if @validation == :region && @regions.empty? %>
@@ -19,8 +19,8 @@
   <%= required_fields_message %>
 
   <% labelled_form_for(:create_enterprise, @create_enterprise) do |f| %>
-    <%= required f.text_field 'identifier'%>
-    <%= required f.text_field 'name'%>
+    <%= required f.text_field 'name', :onchange => "updateUrlField(this, 'create_enterprise_identifier')", :size => 40 %>
+    <%= required labelled_form_field(_('Address'), content_tag('code', environment.top_url + "/" + text_field(:create_enterprise, 'identifier', :size => 25))) %>
     <%= render :partial => 'shared/custom_fields', :locals => { :f => f, :object_name => :create_enterprise, :profile => @create_enterprise, :only_required => false } %>
     <%= required labelled_form_field(_('Region'), f.select('region_id', @regions)) if @validation == :region %>
 
diff --git a/app/views/enterprise_registration/confirmation.rhtml b/app/views/enterprise_registration/confirmation.rhtml
index e5424c3..a623616 100644
--- a/app/views/enterprise_registration/confirmation.rhtml
+++ b/app/views/enterprise_registration/confirmation.rhtml
@@ -1,7 +1,7 @@
-<h2><%= _('Enterprise Registration completed') %></h2>
+<h1><%= _('Enterprise Registration completed') %></h1>
 
 <p>
-<%= _("Your enterprise registration request was successfully registered. The validator organization you choose (%s) should get in touch with to start the validation process. As soon as the validators approve (or reject) your request, you will be notified by e-mail.") % @create_enterprise.target.name %> 
+<%= _("Your enterprise registration request was successfully registered. The validator organization you choose (%s) should get in touch with to start the validation process. As soon as the validators approve (or reject) your request, you will be notified by e-mail.") % link_to(@create_enterprise.target.name, @create_enterprise.target.url) %>
 </p>
 
 <p>
diff --git a/app/views/enterprise_registration/select_validator.rhtml b/app/views/enterprise_registration/select_validator.rhtml
index 1233e4b..c3dd3b3 100644
--- a/app/views/enterprise_registration/select_validator.rhtml
+++ b/app/views/enterprise_registration/select_validator.rhtml
@@ -1,4 +1,4 @@
-<h2><%= _('Enterprise Registration: Select a validator organization') %></h2>
+<h1><%= _('Enterprise Registration: validator organization') %></h1>
 
 <p>
 <%= _('Select one organization to validate your enterprise registration request. Check the provided information about their validation methodoly and criteria.') %>
@@ -7,14 +7,20 @@
 <% form_tag do %>
   <%= render :partial => 'hidden_fields' %>
 
-  <% for validator in @validators %>
-    <div>
-      <%= labelled_radio_button validator.name, 'create_enterprise[target_id]', validator.id, true %>
-
-      <%= labelled_form_field(_('Validation Methodology:'), validator.validation_methodology || _("(not informed)")) %>
-      <%= labelled_form_field(_('Restrictions (if any):'), validator.validation_restrictions || _("(not informed)")) %>
-    </div>
+  <table>
+    <tr>
+      <th><%= _('Name') %></th>
+      <th><%= _('Validation Methodology:') %></th>
+      <th><%= _('Restrictions (if any):') %></th>
+    </tr>
+  <% @validators.each do |validator| %>
+    <tr>
+      <td><%= labelled_radio_button validator.name, 'create_enterprise[target_id]', validator.id  %></td>
+      <td><%= validator.validation_methodology || _("(not informed)") %></td>
+      <td><%= validator.validation_restrictions || _("(not informed)") %></td>
+    </tr>
   <% end %>
+  </table>
 
   <% button_bar do %>
     <%= submit_button 'save', _('Confirm') %>
--
libgit2 0.21.2