diff --git a/lib/controlled_vocabulary_helper.rb b/lib/controlled_vocabulary_helper.rb
new file mode 100644
index 0000000..e17a6a3
--- /dev/null
+++ b/lib/controlled_vocabulary_helper.rb
@@ -0,0 +1,14 @@
+module ControlledVocabularyHelper
+
+  def self.get_categories_as_options
+    categories = []
+
+    ControlledVocabulary.attribute_names.each do |attribute|
+      if attribute.to_s != "id" && attribute.to_s != "software_info_id" then
+        categories << "<option>#{attribute.titleize}</option>".html_safe
+      end
+    end
+
+    categories
+  end
+end
diff --git a/lib/mpog_software_plugin.rb b/lib/mpog_software_plugin.rb
index d848767..9bc57bd 100644
--- a/lib/mpog_software_plugin.rb
+++ b/lib/mpog_software_plugin.rb
@@ -325,10 +325,10 @@ class MpogSoftwarePlugin < Noosfero::Plugin
     end
   end
 
-  def add_new_search_filter type
-    if type == "People"
+  def add_new_search_filter
+    if context.params[:action] == "people"
       expanded_template('search/search_user_filter.html.erb')
-    else type == "Community"
+    else context.params[:action] == "communities"
       expanded_template('search/search_community_filter.html.erb')
     end
   end
diff --git a/public/style.css b/public/style.css
index 2ba04b8..bf14f0c 100644
--- a/public/style.css
+++ b/public/style.css
@@ -77,28 +77,25 @@
   height: auto;
 }
 
-.user_filter_options {
+.mpog_search_form_fields {
+  margin-top: 10px;
   width: 80%;
   height: auto;
   position: relative;
   float: left;
 }
 
-.user_filter_options input[type='text'] {
-  width: 78%;
-
+.mpog_search_form_button {
+  margin-top: 10px;
 }
 
-.user_filter_actions {
-  width: 18 %;
-  height: auto;
-  position: relative;
-  float: right;
-  text-align: right;
+.mpog_search_form_fields input[type='text'] {
+  width: 90%;
+
 }
 
-.search-table tr td:first-child {
-  width: 40px;
+.mpog_search_form_table tr td:first-child {
+  width: 22%;
 }
 
 .formfieldline {
diff --git a/views/search/search_community_filter.html.erb b/views/search/search_community_filter.html.erb
index abd5cbd..1d15a85 100644
--- a/views/search/search_community_filter.html.erb
+++ b/views/search/search_community_filter.html.erb
@@ -1,8 +1,8 @@
 <form action="/search/communities" name="community_filter" method="POST" class="search_form">
   <div id="search_content">
-    <div class="search_options">
 
-      <table class="search-table formfield type-radio">
+    <div class="search_options">
+      <table class="mpog_search_form_table formfield type-radio">
         <tr>
           <td> 
             <%= label_tag("type_Community", _("Community")) %>
@@ -16,112 +16,21 @@
       </table>
     </div>
 
-    </br>
-
-    <span class="community_fields">
-      <table>
-        <tr>
-          <td>
-            <%= label_tag("name", _("Name"))%>
-            <%= text_field_tag(:name) %>
-          </td>
-        </tr>
-      </table>
-    </span>
-
-    <span class="software_fields">
-      <table>
-        <tr>
-          <td>
-            <%= label_tag("name", _("Name"))%>
-            <%= text_field_tag(:name) %>
-          </td>
-        </tr>
-
-        <tr>
-          <td>
-            <%= select_tag("database[][database_description_id]", SoftwareHelper.select_options(DatabaseDescription.all)) %>
-          </td>
-        </tr>
-
-        <tr>
-          <td>
-            <%= select_tag("language[][programming_language_id]", SoftwareHelper.select_options(ProgrammingLanguage.all)) %>
-          </td>
-        </tr>
-
-        <tr>
-          <td>
-            <%= select_tag("operating_system[][operating_system_name_id]", SoftwareHelper.select_options(OperatingSystemName.all)) %>
-          </td>
-        </tr>
-
-
-        <% category = [] %>
-        <% ControlledVocabulary.attribute_names.each do |attribute| %>
-          <% if attribute.to_s != "id" && attribute.to_s != "software_info_id" %>
-            <% category << "<option>#{attribute.titleize}</option>".html_safe %>
-          <% end %>
-        <% end %>
-        
-        <tr>
-          <td>
-            <%= select_tag("controlled_vocabulary[][controlled_vocabulary]", category) %>
-          </td>
-        </tr>
-          
-        <% licenses = [] %>
-        <% LicenseInfo.all.map do |license| %>
-          <% licenses <<  "<option>#{license.version}</option>".html_safe %>
-        <% end %>
-        
-        <tr>
-          <td>
-            <%= select_tag("license_select", licenses) %>
-          </td>
-        </tr>
-
-
-        <tr>
-          <td>
-            <%= labelled_check_box _("Adherent to e-PING ?"), "e-ping" %>
-          </td>
-        </tr>
-
-        <tr>
-          <td>
-            <%= labelled_check_box  _("Adherent to e-MAG ?"), "e-mag" %>
-          </td>
-        </tr>
-
-        <tr>
-          <td>
-            <%= labelled_check_box  _("Adherent to ICP-Brasil ?"), "icp-brasil" %>
-          </td>
-        </tr>
-        
-        <tr>
-          <td>
-            <%= labelled_check_box _("Adherent to e-ARQ ?"), "e-arq" %>
-          </td>
-        </tr>
-
-        <tr>
-          <td>
-            <%= labelled_check_box _("Internacionalizable ?"), "internacionalizable"%>
-          </td>
-        </tr>
-
-      </table>
-    </span>
+    <div class="community_fields mpog_search_form_fields">
+      <%= expanded_template "search/search_forms/_community_fields.html.erb" %>
+    </div>
 
-    <span class="institution_fields">
-    </span>
+    <div class="software_fields mpog_search_form_fields">
+      <%= expanded_template "search/search_forms/_software_fields.html.erb" %>
+    </div>
 
+    <div class="institution_fields mpog_search_form_fields">
+      <%= expanded_template "search/search_forms/_institution_fields.html.erb" %>
+    </div>
 
-    <tr>
-      <td> <%= submit_button(:search, _('Search')) %> </td>
-    </tr>
+    <div class="mpog_search_form_button">
+      <%= submit_button(:search, _('Search')) %>
+    </div>
   </div>
 
 </form>
diff --git a/views/search/search_forms/_community_fields.html.erb b/views/search/search_forms/_community_fields.html.erb
new file mode 100644
index 0000000..e32860d
--- /dev/null
+++ b/views/search/search_forms/_community_fields.html.erb
@@ -0,0 +1,8 @@
+<table class="mpog_search_form_table">
+  <tr>
+    <td>
+      <%= label_tag("name", _("Name"))%>
+      <%= text_field_tag(:name) %>
+    </td>
+  </tr>
+</table>
\ No newline at end of file
diff --git a/views/search/search_forms/_institution_fields.html.erb b/views/search/search_forms/_institution_fields.html.erb
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/views/search/search_forms/_institution_fields.html.erb
diff --git a/views/search/search_forms/_software_fields.html.erb b/views/search/search_forms/_software_fields.html.erb
new file mode 100644
index 0000000..9aa877e
--- /dev/null
+++ b/views/search/search_forms/_software_fields.html.erb
@@ -0,0 +1,141 @@
+<table class="mpog_search_form_table">
+  <tr>
+    <td> <%= label_tag("name", _("Name"))%> </td>
+    <td> <%= text_field_tag(:name) %> </td>
+  </tr>
+
+  <tr>
+    <td> <%= _("Database") %> </td>
+    <td>
+      <%= select_tag("database_description", SoftwareHelper.select_options(DatabaseDescription.all)) %>
+    </td>
+  </tr>
+
+  <tr>
+    <td> <%= _("Programming Language") %> </td>
+    <td>
+      <%= select_tag("programming_language", SoftwareHelper.select_options(ProgrammingLanguage.all)) %>
+    </td>
+  </tr>
+
+  <tr>
+    <td> <%= _("Operating System") %> </td>
+    <td>
+      <%= select_tag("operating_system", SoftwareHelper.select_options(OperatingSystemName.all)) %>
+    </td>
+  </tr>
+
+  <tr>
+    <td> <%= _("Controlled Vocabulary") %> </td>
+    <td>
+      <%= select_tag("controlled_vocabulary", ControlledVocabularyHelper.get_categories_as_options) %>
+    </td>
+  </tr>
+
+  <tr>
+    <td> <%= _("License Used") %> </td>
+    <td>
+      <%= collection_select(:license_info, :id, LicenseInfo.all, :id, :version, :prompt=>_("Any")) %>
+    </td>
+  </tr>
+
+  <tr>
+    <td> <%= _("Adherent to e-PING ?") %> </td>
+    <td>
+      <label>
+        <%= radio_button_tag(:e_ping, "any", true) %>
+        <%= _("Any") %>
+      </label>
+
+      <label>
+        <%= radio_button_tag(:e_ping, "yes") %>
+        <%= _("Yes") %>
+      </label>
+
+      <label>
+        <%= radio_button_tag(:e_ping, "no") %>
+        <%= _("No") %>
+      </label>
+    </td>
+  </tr>
+
+  <tr>
+    <td> <%= _("Adherent to e-MAG ?") %> </td>
+    <td>
+      <label>
+        <%= radio_button_tag(:e_mag, "any", true) %>
+        <%= _("Any") %>
+      </label>
+
+      <label>
+        <%= radio_button_tag(:e_mag, "yes") %>
+        <%= _("Yes") %>
+      </label>
+
+      <label>
+        <%= radio_button_tag(:e_mag, "no") %>
+        <%= _("No") %>
+      </label>
+    </td>
+  </tr>
+
+  <tr>
+    <td> <%= _("Adherent to ICP-Brasil ?") %> </td>
+    <td>
+      <label>
+        <%= radio_button_tag(:icp_brasil, "any", true) %>
+        <%= _("Any") %>
+      </label>
+
+      <label>
+        <%= radio_button_tag(:icp_brasil, "yes") %>
+        <%= _("Yes") %>
+      </label>
+
+      <label>
+        <%= radio_button_tag(:icp_brasil, "no") %>
+        <%= _("No") %>
+      </label>
+    </td>
+  </tr>
+
+  <tr>
+    <td> <%= _("Adherent to e-ARQ ?") %> </td>
+    <td>
+      <label>
+        <%= radio_button_tag(:e_arq, "any", true) %>
+        <%= _("Any") %>
+      </label>
+
+      <label>
+        <%= radio_button_tag(:e_arq, "yes") %>
+        <%= _("Yes") %>
+      </label>
+
+      <label>
+        <%= radio_button_tag(:e_arq, "no") %>
+        <%= _("No") %>
+      </label>
+    </td>
+  </tr>
+
+  <tr>
+    <td> <%= _("Internacionalizable ?") %> </td>
+    <td>
+      <label>
+        <%= radio_button_tag(:internacionalizable, "any", true) %>
+        <%= _("Any") %>
+      </label>
+
+      <label>
+        <%= radio_button_tag(:internacionalizable, "yes") %>
+        <%= _("Yes") %>
+      </label>
+
+      <label>
+        <%= radio_button_tag(:internacionalizable, "no") %>
+        <%= _("No") %>
+      </label>
+    </td>
+  </tr>
+</table>
\ No newline at end of file
diff --git a/views/search/search_user_filter.html.erb b/views/search/search_user_filter.html.erb
index 5ca0e16..ea39459 100644
--- a/views/search/search_user_filter.html.erb
+++ b/views/search/search_user_filter.html.erb
@@ -1,8 +1,8 @@
 <form action="/search/people" name="user_filter" method="POST" class="search_form">
   <div id="user_filter_content">
-    <div class="user_filter_options">
+    <div class="mpog_search_form_fields">
 
-      <table class="search-table">
+      <table class="mpog_search_form_table">
         <tr>
           <td> <%= label_tag :name, _("Name") %> </td>
           <td> <%= text_field_tag :name %> </td>
@@ -25,11 +25,5 @@
         </tr>
       </table>
     </div>
-
-    </br>
-
-    <div class="user_filter_actions">
-      
-    </div>
   </div>
 </form>
\ No newline at end of file
--
libgit2 0.21.2