diff --git a/app/controllers/public/account_controller.rb b/app/controllers/public/account_controller.rb
index f6fa00b..2d4dd2c 100644
--- a/app/controllers/public/account_controller.rb
+++ b/app/controllers/public/account_controller.rb
@@ -13,8 +13,9 @@ class AccountController < PublicController
 
   # action to perform login to the application
   def login
+    @user = User.new
     return unless request.post?
-    self.current_user = User.authenticate(params[:login], params[:password])
+    self.current_user = User.authenticate(params[:user][:login], params[:user][:password])
     if logged_in?
       if params[:remember_me] == "1"
         self.current_user.remember_me
diff --git a/app/controllers/public/search_controller.rb b/app/controllers/public/search_controller.rb
index f71be50..a1f27fd 100644
--- a/app/controllers/public/search_controller.rb
+++ b/app/controllers/public/search_controller.rb
@@ -2,6 +2,6 @@ class SearchController < ApplicationController
   def index
     @query = params[:query] || ''
     # TODO: uncomment find_by_contents when ferret start working 
-    @results = Article.find_tagged_with(@query) #+ Article.find_by_contents(@query)
+    @results = Article.find_tagged_with(@query) + Article.find_all_by_title(@query) + Profile.find_all_by_name(@query)
   end
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 94fa7d4..ca1e2ab 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -276,7 +276,7 @@ module ApplicationHelper
       submit_tag(_('Search'), :id => 'button_search'),
       text_field_tag( 'query', _('  '), :id => "input_search"),
        '</form>',
-      observe_field('input_search', :function => "element.value=''", :on => :focus)
+ #     observe_field('input_search', :function => "element.value=''", :on => :focus)
     ].join("\n") 
   end
 
diff --git a/app/views/account/login.rhtml b/app/views/account/login.rhtml
index 9ddf46c..195fe9e 100644
--- a/app/views/account/login.rhtml
+++ b/app/views/account/login.rhtml
@@ -1,18 +1,16 @@
 <h1><%= _('Login') %></h1>
 
-<% form_tag do -%>
-<p><label for="login"> <%= _('Username') %> </label><br/>
-<%= text_field_tag 'login' %></p>
 
-<p><label for="password"> <%= _('Password') %></label><br/>
-<%= password_field_tag 'password' %></p>
+<% labelled_form_for :user, @user do |f| -%>
+  <%= f.text_field :login %>
+  <%= f.password_field :password %>
+  <p class="submitline"><%= submit_tag 'Sign up', {:class => 'submit'} %></p>
 
 <!-- Uncomment this if you want this functionality
 <p><label for="remember_me">Remember me:</label>
 <%= check_box_tag 'remember_me' %></p>
 -->
 
-<p><%= submit_tag 'Log in' %></p>
 <% end -%>
 
 
diff --git a/app/views/enterprise_editor/_form.rhtml b/app/views/enterprise_editor/_form.rhtml
index c435e07..9f333f5 100644
--- a/app/views/enterprise_editor/_form.rhtml
+++ b/app/views/enterprise_editor/_form.rhtml
@@ -1,32 +1,32 @@
-<p><label for="name"><%= _('Name') %></label><br/>
-<%= text_field 'enterprise', 'name', 'size' => 20 %></p>
+<label class='formlabel' for="name"><%= _('Name') %></label>
+<p class='formfield text_field'><%= text_field 'enterprise', 'name', 'size' => 20, 'class' => 'formfield text_field' %></p>
 
-<p><label for="address"><%= _('Address') %></label><br/>
+<p class='formfield text_field'><label for="address"><%= _('Address') %></label><br/>
 <%= text_field 'enterprise', 'address', 'size' => 50 %></p>
 
-<p><label for="contact_phone"><%= _('Contact Phone') %></label><br/>
+<p class='formfield text_field'><label for="contact_phone"><%= _('Contact Phone') %></label><br/>
 <%= text_field 'enterprise', 'contact_phone', 'size' => 20 %></p>
 
-<p><label for="contact_person"><%= _('Contact Person') %></label><br/>
+<p class='formfield text_field'><label for="contact_person"><%= _('Contact Person') %></label><br/>
 <%= text_field 'organization_info', 'contact_person', 'size' => 20  %></p>
 
-<p><label for="acronym"><%= _('Acronym') %></label><br/>
+<p class='formfield text_field'><label for="acronym"><%= _('Acronym') %></label><br/>
 <%= text_field 'organization_info', 'acronym', 'size' => 20 %></p>
 
-<p><label for="foundation_year"><%= _('Foundation Year') %></label><br/>
+<p class='formfield text_field'><label for="foundation_year"><%= _('Foundation Year') %></label><br/>
 <%= text_field 'organization_info', 'foundation_year', 'size' => 20  %></p>
 
-<p><label for="legal_form"><%= _('Legal Form') %></label><br/>
+<p class='formfield text_field'><label for="legal_form"><%= _('Legal Form') %></label><br/>
 <%= text_field 'organization_info', 'legal_form', 'size' => 20 %></p>
 
-<p><label for="economic_activity"><%= _('Economic Activity') %></label><br/>
+<p class='formfield text_field'><label for="economic_activity"><%= _('Economic Activity') %></label><br/>
 <%= text_field 'organization_info', 'economic_activity', 'size' => 20 %></p>
 
-<p><label for="management_information"><%= _('Management Information') %></label><br/>
+<p class='formfield text_area'><label for="management_information"><%= _('Management Information') %></label><br/>
 <%= text_area 'organization_info', 'management_information', 'cols' => 40, 'rows' => 20 %></p>
 
-<p><label for="validation_entity"><%= _('Validation Entity') %></label><br/>
+<p class='formfield select'><label for="validation_entity"><%= _('Validation Entity') %></label><br/>
 <%= select 'validation_entity', 'id', @validation_entities.map{|v| [v.name, v.id]}, :include_blank => true %></p>
 
-<p><label for="tag_list"><%= _('Tags') %></label><br/>
+<p class='formfield text_field'><label for="tag_list"><%= _('Tags') %></label><br/>
 <%= text_field 'enterprise', 'tag_list', 'size' => 20 %></p>
diff --git a/app/views/search/index.rhtml b/app/views/search/index.rhtml
index 66b08c0..9b87747 100644
--- a/app/views/search/index.rhtml
+++ b/app/views/search/index.rhtml
@@ -1,6 +1,8 @@
 <h2> <%= _('Listing articles found')  %> </h2>
 
-<h4> <%= _('Searching for ') + @query  %></h4>
+<h3> <%= _('Searching for ') + @query  %></h3>
 <% @results.each do |a| %>
-  <h4> <%= link_to_document(a)  %> </h4>
+  <h4> <%= link_to_document(a) if a.kind_of?(Article) %> </h4>
+  <h4> <%= link_to_homepage(a.name, a.identifier) if a.kind_of?(Profile) %> </h4>
+
 <% end %>
diff --git a/test/functional/search_controller_test.rb b/test/functional/search_controller_test.rb
index a7a4347..c1a9203 100644
--- a/test/functional/search_controller_test.rb
+++ b/test/functional/search_controller_test.rb
@@ -11,8 +11,14 @@ class SearchControllerTest < Test::Unit::TestCase
     @response   = ActionController::TestResponse.new
   end
 
-  # Replace this with your real tests.
-  def test_truth
-    assert true
+  should 'find enterprise' do
+    ent = Enterprise.create!(:name => 'teste', :identifier => 'teste')
+    get 'index', :query => 'teste'
+    assert_response :success
+    assert_template 'index'
+    assert assigns('results')
+    assert assigns('results').include?(ent)
+
   end
+
 end
--
libgit2 0.21.2