diff --git a/app/controllers/public/content_viewer_controller.rb b/app/controllers/public/content_viewer_controller.rb
index 519d006..969a785 100644
--- a/app/controllers/public/content_viewer_controller.rb
+++ b/app/controllers/public/content_viewer_controller.rb
@@ -43,11 +43,6 @@ class ContentViewerController < ApplicationController
       return
     end
 
-    if request.xhr? && params[:toolbar]
-      render :partial => 'article_toolbar'
-      return
-    end
-
     redirect_to_translation if @page.profile.redirect_l10n
 
     # At this point the page will be showed
diff --git a/app/views/blocks/profile_image.rhtml b/app/views/blocks/profile_image.rhtml
index 5c5194d..be1f7ef 100644
--- a/app/views/blocks/profile_image.rhtml
+++ b/app/views/blocks/profile_image.rhtml
@@ -14,11 +14,13 @@
   <p><%= h block.owner.short_name %></p>
 <% end %>
 
-<div style="text-align: center; font-size: 75%; clear: both" id="profile-admin-url-<%= block.id %>"></div>
-
-<div class="profile-info-options" id="profile-info-options-<%= block.id %>"></div>
+<% if !user.nil? and user.has_permission?('edit_profile', profile) %>
+  <div class='admin-link'>
+    <%= link_to _('Control panel'), :controller => 'profile_editor' %>
+  </div>
+<% end %>
 
+<div class="profile-info-options">
+  <%= render :file => view_for_profile_actions(block.owner.class) %>
+</div>
 </div><!-- end class="vcard" -->
-<script type="text/javascript">
-  <%= remote_function :url => { :controller => 'profile', :profile => profile.identifier, :action => 'profile_info', :block_id => block.id } %>
-</script>
diff --git a/app/views/blocks/profile_info.rhtml b/app/views/blocks/profile_info.rhtml
index 012ffc8..edbaa1b 100644
--- a/app/views/blocks/profile_info.rhtml
+++ b/app/views/blocks/profile_info.rhtml
@@ -14,13 +14,15 @@
   </div>
 </div>
 
-<ul class="profile-info-data" id="profile-info-data-<%= block.id %>">
+<ul class="profile-info-data">
   <li><%= link_to __('Homepage'), block.owner.url, :class => 'url' %></li>
   <li><%= link_to _('View profile'), block.owner.public_profile_url %></li>
   <% if block.owner.enterprise? && !block.owner.environment.enabled?('disable_products_for_enterprises') %>
     <li><%= link_to(_('Products/Services'), :controller => 'catalog', :profile => block.owner.identifier) %></li>
   <% end %>
-  <li id="profile-admin-url-<%= block.id %>"></li>
+  <% if !user.nil? and user.has_permission?('edit_profile', profile) %>
+    <li><%= link_to _('Control panel'), :controller => 'profile_editor' %></li>
+  <% end %>
   <% if profile.person? %>
     <li><%= _('Since %{year}/%{month}') % { :year => block.owner.created_at.year, :month => block.owner.created_at.month } %></li>
   <% end %>
@@ -37,9 +39,8 @@
 </div>
 <% end %>
 
-<div class="profile-info-options" id="profile-info-options-<%= block.id %>"></div>
+<div class="profile-info-options">
+  <%= render :file => view_for_profile_actions(@block.owner.class) %>
+</div>
 
 </div><!-- end class="vcard" -->
-<script type="text/javascript">
-  <%= remote_function :url => { :controller => 'profile', :profile => profile.identifier, :action => 'profile_info', :block_id => block.id } %>
-</script>
diff --git a/app/views/content_viewer/view_page.rhtml b/app/views/content_viewer/view_page.rhtml
index 2528e7b..78dbfda 100644
--- a/app/views/content_viewer/view_page.rhtml
+++ b/app/views/content_viewer/view_page.rhtml
@@ -14,11 +14,9 @@
     window.NO_COMMENT_YET = "<%= _('No comments yet') %>";
 </script>
 
-<div id="article-toolbar"></div>
-
-<script type="text/javascript">
-  <%= remote_function :update => "article-toolbar", :url => @page.url.merge({ :toolbar => true, :only_path => true }) %>
-</script>
+<div id="article-toolbar">
+  <%= render :partial => 'article_toolbar' %>
+</div>
 
 <% if @page.display_hits? || @page.license.present? %>
   <div id='article-sub-header'>
diff --git a/app/views/profile/profile_info.rjs b/app/views/profile/profile_info.rjs
deleted file mode 100644
index b402006..0000000
--- a/app/views/profile/profile_info.rjs
+++ /dev/null
@@ -1,6 +0,0 @@
-if !user.nil? and user.has_permission?('edit_profile', profile)
-  page.replace_html "profile-admin-url-#{@block.id}", link_to(_('Control panel'), @block.owner.admin_url)
-else
-  page.hide "profile-admin-url-#{@block.id}"
-end
-page.replace_html "profile-info-options-#{@block.id}", :file => view_for_profile_actions(@block.owner.class)
diff --git a/public/designs/themes/base/style.css b/public/designs/themes/base/style.css
index fd6c39b..a05b4f8 100644
--- a/public/designs/themes/base/style.css
+++ b/public/designs/themes/base/style.css
@@ -575,6 +575,12 @@ div#notice {
   color: #555;
 }
 
+.profile-image-block .admin-link {
+  text-align: center;
+  font-size: 75%;
+  clear: both;
+}
+
 
 /*************************** My Network ******************************/
 
--
libgit2 0.21.2