diff --git a/app/controllers/enterprise_controller.rb b/app/controllers/enterprise_controller.rb
index c6f7c72..1f17be2 100644
--- a/app/controllers/enterprise_controller.rb
+++ b/app/controllers/enterprise_controller.rb
@@ -86,11 +86,11 @@ class EnterpriseController < ApplicationController
   def activate
     @enterprise = Enterprise.find(params[:id])
     if @enterprise.update_attribute('active', true)
-      flash[:notice] = 'Enterprise successfuly activacted'
-      render :action => 'show'
+      flash[:notice] = _('Enterprise successfuly activacted')
     else
-      redirect_to :action => 'show', :id => @enterprise
+      flash[:notice] = _('Failed to activate the enterprise')
     end
+    redirect_to :action => 'index'
   end
 
   protected
diff --git a/app/views/enterprise/_enterprise.rhtml b/app/views/enterprise/_enterprise.rhtml
index 9172dc5..346106b 100644
--- a/app/views/enterprise/_enterprise.rhtml
+++ b/app/views/enterprise/_enterprise.rhtml
@@ -1,6 +1,11 @@
 <li> 
 <%= link_to enterprise.name, :action => 'show', :id => enterprise %>
 <%= link_to _('Edit'), :action => 'edit', :id => enterprise %>
+<%= help _('Change the infomation about the enterprise') %>
 <%= link_to _('Delete'), :action => 'destroy', :id => enterprise %>
+<%= help _('Remove the enterprise from the system') %>
 <%= link_to _('Affiliate'), :action => 'affiliate', :id => enterprise unless @my_enterprises.include?(enterprise) %>
+<%= help _('Be a member of the enterprise') unless @my_enterprises.include?(enterprise) %>
+<%= link_to _('Activate'), :action => 'activate', :id => enterprise if @my_pending_enterprises.include?(enterprise) %>
+<%= help _('Activate the profile of an approved enterprise') if @my_pending_enterprises.include?(enterprise) %>
 </li>
diff --git a/app/views/enterprise/_search_box.rhtml b/app/views/enterprise/_search_box.rhtml
index 895590d..a4f1582 100644
--- a/app/views/enterprise/_search_box.rhtml
+++ b/app/views/enterprise/_search_box.rhtml
@@ -2,5 +2,6 @@
 <% form_tag :action => 'search' do %>
   <%= text_field_tag 'query' %>
   <%= submit_tag _('Search') %>
+  <%= help _('Search enteprises by tag or name') %>
 <% end %>
 </div>
diff --git a/app/views/enterprise/edit.rhtml b/app/views/enterprise/edit.rhtml
index 88fd12d..b238d4a 100644
--- a/app/views/enterprise/edit.rhtml
+++ b/app/views/enterprise/edit.rhtml
@@ -4,6 +4,6 @@
 
 <% form_tag :action => 'update', :id => @enterprise do %>
   <%= render :partial => 'form' %>
-<p><%= submit_tag _('Register') %>
+<p><%= submit_tag _('Update') %>
 <%= link_to _('Cancel'), :action => 'index' %></p>
 <% end %>
diff --git a/app/views/enterprise/list.rhtml b/app/views/enterprise/list.rhtml
index d6e468e..27d9e2a 100644
--- a/app/views/enterprise/list.rhtml
+++ b/app/views/enterprise/list.rhtml
@@ -1,6 +1,9 @@
 <%= render :partial => 'search_box' %>
 
-<p> <%= link_to _('Register new enterprise'), :action => 'register_form' %> </p>
+<p> <%= link_to _('Register new enterprise'), :action => 'register_form' %> 
+<%= help _('Creates a new enterprise') %>
+</p>
+
 
 <h2> <%= _('Listing my enterprises') %> </h2>
 <ul>
@@ -14,7 +17,9 @@
   </ul>
 <% end %>
 
+<% unless @enterprises.blank? %>
 <h4> <%= _('Other Enterprises') %> </h4>
 <ul>
   <%= render :partial => 'enterprise', :collection => @enterprises %>
 </ul>
+<% end %>
diff --git a/app/views/enterprise/show.rhtml b/app/views/enterprise/show.rhtml
index 1437438..1b55b1a 100644
--- a/app/views/enterprise/show.rhtml
+++ b/app/views/enterprise/show.rhtml
@@ -16,5 +16,8 @@
 <p> <%= _('Tags:') %> <%= @enterprise.tag_list %> </p>
 
 <%= link_to _('Edit enterprise'), :action => 'edit', :id => @enterprise %>
+<%= help _('Change the information about the enterprise') %>
 <%= link_to _('Delete enterprise'), :action => 'destroy', :id => @enterprise %>
+<%= help _('Remove the enterprise from the system') %>
 <%= link_to _('Affiliate'), :action => 'affiliate' unless @my_enterprises.include?(@enterprise) %>
+<%= help _('Be a member of the enterprise') %>
--
libgit2 0.21.2