diff --git a/app/controllers/my_profile/followers_controller.rb b/app/controllers/my_profile/followers_controller.rb
index ee38813..170e772 100644
--- a/app/controllers/my_profile/followers_controller.rb
+++ b/app/controllers/my_profile/followers_controller.rb
@@ -1,4 +1,4 @@
-class FollowedPeopleController < MyProfileController
+class FollowersController < MyProfileController
 
   def index
     @followed_people = Person.all.limit(10).paginate(:per_page => 5, :page => params[:npage])
diff --git a/app/views/followed_people/_profile_list.html.erb b/app/views/followed_people/_profile_list.html.erb
deleted file mode 100644
index e919c12..0000000
--- a/app/views/followed_people/_profile_list.html.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-<ul class="profile-list">
-  <% profiles.each do |profile| %>
-    <li>
-    <%= link_to_profile profile_image(profile) + tag('br') + profile.short_name,
-                        profile.identifier, :class => 'profile-link' %>
-        <div id="category-name">
-            <%= _(Category) %> 
-        </div>
-    <div class="controll">
-      <%= button_without_text :remove, content_tag('span',_('remove')),
-          { :action => 'remove', :id => profile.id },
-            :title => _('remove') %>
-      <%= modal_icon_button :change_categoy, content_tag('span',_('change category')),
-             profile.url.merge(:controller => 'followed_people', :action => 'set_category', :profile => profile.identifier)%>
-    </div><!-- end class="controll" -->
-    </li>
-  <% end %>
-</ul>
diff --git a/app/views/followed_people/_set_category_modal.html.erb b/app/views/followed_people/_set_category_modal.html.erb
deleted file mode 100644
index fa9d159..0000000
--- a/app/views/followed_people/_set_category_modal.html.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class='set-category-content'>
-    <h2><%= _("Select a category") %></h2> 
-    <form>
-        <%= labelled_text_field _("Category: "), "person_category" %>
-        <div>
-            <%= submit_button('save', _('Save')) %>
-            <%= modal_close_button  _("Cancel") %>
-        </div>
-    </form>
-</div>
diff --git a/app/views/followed_people/index.html.erb b/app/views/followed_people/index.html.erb
deleted file mode 100644
index c496b67..0000000
--- a/app/views/followed_people/index.html.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-<div id="manage_followed people">
-
-<h1><%= _("%s following") % profile.name %></h1>
-
-<% cache_timeout(profile.manage_friends_cache_key(params), 4.hours) do %>
-  <% if @followed_people.empty? %>
-    <p>
-      <em>
-        <%= _("You don't follow anybody yet.") %>
-      </em>
-    </p>
-  <% end %>
-
-  <%= button_bar do %>
-    <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
-    <%= button(:search, _('Find people'), :controller => 'search', :action => 'assets', :asset => 'people') %>
-  <% end %>
-
-  <%= render :partial => 'profile_list', :locals => { :profiles => @followed_people } %>
-
-  <br style="clear:both" />
-  <%= pagination_links @followed_people, :param_name => 'npage' %>
-<% end %>
-
-</div>
diff --git a/app/views/followers/_profile_list.html.erb b/app/views/followers/_profile_list.html.erb
new file mode 100644
index 0000000..2611cbe
--- /dev/null
+++ b/app/views/followers/_profile_list.html.erb
@@ -0,0 +1,18 @@
+<ul class="profile-list">
+  <% profiles.each do |profile| %>
+    <li>
+    <%= link_to_profile profile_image(profile) + tag('br') + profile.short_name,
+                        profile.identifier, :class => 'profile-link' %>
+        <div id="category-name">
+            <%= _(Category) %> 
+        </div>
+    <div class="controll">
+      <%= button_without_text :remove, content_tag('span',_('unfollow')),
+          { :controller => "profile", :profile => profile.identifier , :action => 'unfollow', :redirect_to => "gabriel" },
+            :title => _('remove') %>
+      <%= modal_icon_button :change_categoy, content_tag('span',_('change category')),
+             profile.url.merge(:controller => 'followers', :action => 'set_category', :profile => profile.identifier)%>
+    </div><!-- end class="controll" -->
+    </li>
+  <% end %>
+</ul>
diff --git a/app/views/followers/_set_category_modal.html.erb b/app/views/followers/_set_category_modal.html.erb
new file mode 100644
index 0000000..fa9d159
--- /dev/null
+++ b/app/views/followers/_set_category_modal.html.erb
@@ -0,0 +1,10 @@
+<div class='set-category-content'>
+    <h2><%= _("Select a category") %></h2> 
+    <form>
+        <%= labelled_text_field _("Category: "), "person_category" %>
+        <div>
+            <%= submit_button('save', _('Save')) %>
+            <%= modal_close_button  _("Cancel") %>
+        </div>
+    </form>
+</div>
diff --git a/app/views/followers/index.html.erb b/app/views/followers/index.html.erb
new file mode 100644
index 0000000..c496b67
--- /dev/null
+++ b/app/views/followers/index.html.erb
@@ -0,0 +1,25 @@
+<div id="manage_followed people">
+
+<h1><%= _("%s following") % profile.name %></h1>
+
+<% cache_timeout(profile.manage_friends_cache_key(params), 4.hours) do %>
+  <% if @followed_people.empty? %>
+    <p>
+      <em>
+        <%= _("You don't follow anybody yet.") %>
+      </em>
+    </p>
+  <% end %>
+
+  <%= button_bar do %>
+    <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
+    <%= button(:search, _('Find people'), :controller => 'search', :action => 'assets', :asset => 'people') %>
+  <% end %>
+
+  <%= render :partial => 'profile_list', :locals => { :profiles => @followed_people } %>
+
+  <br style="clear:both" />
+  <%= pagination_links @followed_people, :param_name => 'npage' %>
+<% end %>
+
+</div>
diff --git a/app/views/profile_editor/index.html.erb b/app/views/profile_editor/index.html.erb
index 9c99687..4874b04 100644
--- a/app/views/profile_editor/index.html.erb
+++ b/app/views/profile_editor/index.html.erb
@@ -72,6 +72,8 @@
 
   <%= control_panel_button(_('Email Templates'), 'email-templates', :controller => :profile_email_templates) if profile.organization? %>
 
+  <%= control_panel_button(_('Manage followed people'), 'manage-followed-people', :controller => :followers) %>
+
   <% @plugins.dispatch(:control_panel_buttons).each do |button| %>
     <%= control_panel_button(button[:title], button[:icon], button[:url], button[:html_options]) %>
   <% end %>
diff --git a/public/stylesheets/profile-list.scss b/public/stylesheets/profile-list.scss
index 5ad6402..05cfeef 100644
--- a/public/stylesheets/profile-list.scss
+++ b/public/stylesheets/profile-list.scss
@@ -23,7 +23,7 @@
 }
 .controller-favorite_enterprises .profile-list a.profile-link,
 .controller-friends .profile-list a.profile-link,
-.controller-followed_people .profile-list a.profile-link,
+.controller-followers .profile-list a.profile-link,
 .list-profile-connections .profile-list a.profile-link,
 .profiles-suggestions .profile-list a.profile-link {
   text-decoration: none;
@@ -33,13 +33,13 @@
 }
 .controller-favorite_enterprises .profile-list a.profile-link:hover,
 .controller-friends .profile-list a.profile-link:hover,
-.controller-followed_people .profile-list a.profile-link:hover,
+.controller-followers .profile-list a.profile-link:hover,
 .profiles-suggestions .profile-list a.profile-link:hover {
   color: #FFF;
 }
 .controller-favorite_enterprises .profile-list .profile_link span,
 .controller-friends .profile-list .profile_link span,
-.controller-followed_people .profile-list .profile_link span,
+.controller-followers .profile-list .profile_link span,
 .box-1 .profiles-suggestions .profile-list .profile_link span {
   width: 80px;
   display: block;
@@ -47,14 +47,14 @@
 }
 .controller-favorite_enterprises .profile-list,
 .controller-friends .profile-list,
-.controller-followed_people .profile-list,
+.controller-followers .profile-list,
 .profiles-suggestions .profile-list {
   position: relative;
 }
 
 .controller-favorite_enterprises .profile-list .controll,
 .controller-friends .profile-list .controll,
-.controller-followed_people .profile-list .controll,
+.controller-followers .profile-list .controll,
 .profiles-suggestions .profile-list .controll {
   position: absolute;
   top: 7px;
@@ -62,7 +62,7 @@
 }
 .controller-favorite_enterprises .profile-list .controll a,
 .controller-friends .profile-list .controll a,
-.controller-followed_people .profile-list .controll a,
+.controller-followers .profile-list .controll a,
 .profiles-suggestions .profile-list .controll a {
   display: block;
   margin-bottom: 2px;
@@ -75,7 +75,7 @@
 }
 .controller-favorite_enterprises .button-bar,
 .controller-friends .button-bar,
-.controller-followed_people .button-bar,
+.controller-followers .button-bar,
 .profiles-suggestions .button-bar {
   clear: both;
   padding-top: 20px;
--
libgit2 0.21.2