diff --git a/app/views/admin_panel/_organization_search.html.erb b/app/views/admin_panel/_organization_search.html.erb
new file mode 100644
index 0000000..ea5c1b4
--- /dev/null
+++ b/app/views/admin_panel/_organization_search.html.erb
@@ -0,0 +1,7 @@
+<div class="search-field">
+<span class="formfield">
+  <%= text_field_tag 'q', @q, :title => _("Find software") %>
+</span>
+<%= submit_button(:search, _('Search')) %>
+</div>
+
diff --git a/app/views/admin_panel/_profiles_list.html.erb b/app/views/admin_panel/_profiles_list.html.erb
new file mode 100644
index 0000000..77b0582
--- /dev/null
+++ b/app/views/admin_panel/_profiles_list.html.erb
@@ -0,0 +1,33 @@
+<div class="environment-users-results-header">
+  <div style="clear: both"></div>
+</div>
+<table>
+  <colgroup>
+    <col width="80%">
+    <col width="20%">
+  </colgroup>
+
+  <tr>
+    <th><%= _('Member') %></th>
+    <th><%= _('Actions') %></th>
+  </tr>
+
+  <% @collection.each do |p| %>
+    <tr title="<%= p.name %>">
+    <td><%= link_to_profile p.short_name, p.identifier, :title => p.name %> </td>
+
+    <td class='actions'>
+      <div class="members-buttons-cell">
+        <% if p.visible %>
+          <%= button_without_text :'deactivate-user', _('Deactivate'), {:controller=>"profile_editor", :action => 'deactivate_profile', :profile=>p.identifier, :id=>p.id}, :confirm => _("Do you want to deactivate this profile ?") %>
+      <% else %>
+          <%= button_without_text :'activate-user', _('Activate'), {:controller=>"profile_editor", :action => 'activate_profile', :profile=>p.identifier, :id=>p.id}, :confirm => _("Do you want to activate this profile ?") %>
+      <% end %>
+        <%= button_without_text :'delete', _('Remove'), {:controller=>"profile_editor", :action => 'destroy_profile', :id => p.id, :profile => p.identifier}, :method => :post, :filter => @filter, :confirm => _("Do you want to remove this profile?") %>
+      </div>
+    </td>
+  </tr>
+<% end %>
+</table>
+
+<%= pagination_links @collection, {:param_name => 'npage', :page_links => true} %>
diff --git a/app/views/admin_panel/manage_organizations_status.html.erb b/app/views/admin_panel/manage_organizations_status.html.erb
index 089cb98..1c6d4d7 100644
--- a/app/views/admin_panel/manage_organizations_status.html.erb
+++ b/app/views/admin_panel/manage_organizations_status.html.erb
@@ -2,17 +2,11 @@
 
 <%= form_tag( { :action => 'manage_organizations_status' }, :method => 'get', :class => 'users-search' ) do %>
 
-  <div class="search-field">
-    <span class="formfield">
-      <%= text_field_tag 'q', @q, :title => _("Find profiles"), :style=>"width:85%" %>
-    </span>
 
-    <%= submit_button(:search, _('Search')) %>
+  <div id="search-softwares">
+    <%= render :partial => "organization_search" %>
   </div>
 
-  <div class="environment-users-results-header">
-    <div id='environment-users-filter-title'><%= @title %></div>
-
     <div id="environment-users-filter-filter">
       <strong><%= _("Filter by: ") %></strong>
 
@@ -23,42 +17,14 @@
     <div style="clear: both"></div>
   </div>
 
-  <table>
-    <colgroup>
-      <col width="80%">
-      <col width="20%">
-    </colgroup>
-
-    <tr>
-      <th><%= _('Member') %></th>
-      <th><%= _('Actions') %></th>
-    </tr>
-
-    <% @collection.each do |p| %>
-      <tr title="<%= p.name %>">
-        <td><%= link_to_profile p.short_name, p.identifier, :title => p.name %> </td>
-
-        <td class='actions'>
-          <div class="members-buttons-cell">
-            <% if p.visible %>
-              <%= button_without_text :'deactivate-user', _('Deactivate'), {:controller=>"profile_editor", :action => 'deactivate_profile', :profile=>p.identifier, :id=>p.id}, :confirm => _("Do you want to deactivate this profile ?") %>
-            <% else %>
-              <%= button_without_text :'activate-user', _('Activate'), {:controller=>"profile_editor", :action => 'activate_profile', :profile=>p.identifier, :id=>p.id}, :confirm => _("Do you want to activate this profile ?") %>
-            <% end %>
-         </div>
-        </td>
-      </tr>
-    <% end %>
-  </table>
+  <%= render :partial => "profiles_list" %>
 
 <% end %>
 
-<%= pagination_links @collection, {:param_name => 'npage', :page_links => true} %>
-
-<script type="text/javascript">
+  <script type="text/javascript">
   jQuery(document).ready(function(){
     jQuery("#profile_filter_select").change(function(){
       document.location.href = '/admin/admin_panel/manage_organizations_status?filter='+this.value;
     });
   });
-</script>
\ No newline at end of file
+</script>
--
libgit2 0.21.2