diff --git a/app/controllers/public/profile_controller.rb b/app/controllers/public/profile_controller.rb
index 3e63569..6de2dd0 100644
--- a/app/controllers/public/profile_controller.rb
+++ b/app/controllers/public/profile_controller.rb
@@ -8,10 +8,10 @@ class ProfileController < PublicController
   helper TagsHelper
 
   def index
-    @network_activities = !@profile.is_a?(Person) ? @profile.tracked_notifications.paginate(:per_page => 30, :page => params[:page]) : []
+    @network_activities = !@profile.is_a?(Person) ? @profile.tracked_notifications.paginate(:per_page => 15, :page => params[:page]) : []
     if logged_in? && current_person.follows?(@profile)
-      @network_activities = @profile.tracked_notifications.paginate(:per_page => 30, :page => params[:page]) if @network_activities.empty?
-      @activities = @profile.activities.paginate(:per_page => 30, :page => params[:page])
+      @network_activities = @profile.tracked_notifications.paginate(:per_page => 15, :page => params[:page]) if @network_activities.empty?
+      @activities = @profile.activities.paginate(:per_page => 15, :page => params[:page])
     end
     @tags = profile.article_tags
     unless profile.display_info_to?(user)
@@ -186,8 +186,6 @@ class ProfileController < PublicController
     @comment = Comment.new(params[:comment])
     @comment.author = user
     @activity = ActionTracker::Record.find(params[:source_id])
-    #FIXME pq n colocar source direto?
-    #@comment.source = ActionTracker::Record.find(params[:source_id])
     @comment.source_type, @comment.source_id = (@activity.target_type == 'Article' ? ['Article', @activity.target_id] : [@activity.class.to_s, @activity.id])
     @tab_action = params[:tab_action]
     @message = @comment.save ? _("Comment successfully added.") : _("You can't leave an empty comment.")
@@ -201,12 +199,12 @@ class ProfileController < PublicController
   end
 
   def view_more_activities
-    @activities = @profile.activities.paginate(:per_page => 30, :page => params[:page])
+    @activities = @profile.activities.paginate(:per_page => 10, :page => params[:page])
     render :partial => 'profile_activities_list', :locals => {:activities => @activities}
   end
 
   def view_more_network_activities
-    @activities = @profile.tracked_notifications.paginate(:per_page => 30, :page => params[:page]) 
+    @activities = @profile.tracked_notifications.paginate(:per_page => 10, :page => params[:page]) 
     render :partial => 'profile_network_activities', :locals => {:network_activities => @activities}
   end
 
diff --git a/app/models/article.rb b/app/models/article.rb
index abf6554..e15b38a 100644
--- a/app/models/article.rb
+++ b/app/models/article.rb
@@ -62,7 +62,7 @@ class Article < ActiveRecord::Base
   validate :translation_must_have_language
 
   def is_trackable?
-    self.published? && self.notifiable? && self.advertise?
+    self.published? && self.notifiable? && self.advertise? && self.profile.public_profile
   end
 
   def external_link=(link)
diff --git a/app/views/profile/_comment.rhtml b/app/views/profile/_comment.rhtml
index b9d886f..ba73efc 100644
--- a/app/views/profile/_comment.rhtml
+++ b/app/views/profile/_comment.rhtml
@@ -1,4 +1,7 @@
-<%# Comment %>
+<% Comment %>
+<% Profile %>
+<% Person %>
+
 <li class="article-comment" style='border-bottom:none;'>
   <div class="article-comment-inner">
 
diff --git a/app/views/profile/_create_article.rhtml b/app/views/profile/_create_article.rhtml
index 702c612..08a47ba 100644
--- a/app/views/profile/_create_article.rhtml
+++ b/app/views/profile/_create_article.rhtml
@@ -10,7 +10,14 @@
   <%= content_tag(:p, link_to(_('See complete forum'), activity.get_url), :class => 'see-forum') if activity.target.is_a?(Forum) %>
   <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
   <div class='profile-wall-actions'>
-    <%= link_to_function _('Comment'), "$('reply_content_#{activity.id}').focus()" %>
+    <%= link_to_function s_('profile|Comment'), "$('reply_content_#{activity.id}').focus()" %>
     <%= link_to_remote(content_tag(:span, _('Remove')), :url =>{:action => 'remove_activity', :activity_id => activity.id, :only_hide => true}, :confirm => _('Are you sure?'), :update => "profile-activity-item-#{activity.id}") if logged_in? && current_person == @profile %>
   </div>
 </div>
+
+<hr />
+<ul class="profile-wall-activities-comments comments-count-<%= activity.comments_count %>" >
+  <%= render :partial => 'comment', :collection => activity.comments %>
+</ul>
+
+<%= render :partial => 'profile_comment_form', :locals => { :activity => activity } %>
diff --git a/app/views/profile/_default_activity.rhtml b/app/views/profile/_default_activity.rhtml
index a811c0f..b0a8190 100644
--- a/app/views/profile/_default_activity.rhtml
+++ b/app/views/profile/_default_activity.rhtml
@@ -5,7 +5,14 @@
   <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
   <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
   <div class='profile-wall-actions'>
-    <%= link_to_function _('Comment'), "$('reply_content_#{activity.id}').focus()" %>
+    <%= link_to_function s_('profile|Comment'), "$('reply_content_#{activity.id}').focus()" %>
     <%= link_to_remote(content_tag(:span, _('Remove')), :confirm => _('Are you sure?'), :url =>{:action => 'remove_activity', :activity_id => activity.id}, :update => "profile-activity-item-#{activity.id}") if logged_in? && current_person == @profile %>
   </div>
 </div>
+
+<hr />
+<ul class="profile-wall-activities-comments comments-count-<%= activity.comments_count %>" >
+  <%= render :partial => 'comment', :collection => activity.comments %>
+</ul>
+
+<%= render :partial => 'profile_comment_form', :locals => { :activity => activity } %>
diff --git a/app/views/profile/_leave_scrap.rhtml b/app/views/profile/_leave_scrap.rhtml
index c363075..307fede 100644
--- a/app/views/profile/_leave_scrap.rhtml
+++ b/app/views/profile/_leave_scrap.rhtml
@@ -1 +1,12 @@
-NÂO DEVE APARECER
+<div class='profile-activity-image'>
+  <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
+</div>
+<div class='profile-activity-description'>
+  <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
+  <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
+  <div class='profile-wall-actions'>
+    <%= link_to_remote(content_tag(:span, _('Remove')), :confirm => _('Are you sure?'), :url =>{:action => 'remove_activity', :activity_id => activity.id}, :update => "profile-activity-item-#{activity.id}") if logged_in? && current_person == @profile %>
+  </div>
+</div>
+
+<br/>
diff --git a/app/views/profile/_leave_scrap_to_self.rhtml b/app/views/profile/_leave_scrap_to_self.rhtml
deleted file mode 100644
index ab8c8e0..0000000
--- a/app/views/profile/_leave_scrap_to_self.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-NÃO É PRA APARECER
diff --git a/app/views/profile/_leave_scrap_to_self.rhtml b/app/views/profile/_leave_scrap_to_self.rhtml
new file mode 120000
index 0000000..56c0e42
--- /dev/null
+++ b/app/views/profile/_leave_scrap_to_self.rhtml
@@ -0,0 +1 @@
+_leave_scrap.rhtml
\ No newline at end of file
diff --git a/app/views/profile/_profile_activities_list.rhtml b/app/views/profile/_profile_activities_list.rhtml
index 19ae645..c634368 100644
--- a/app/views/profile/_profile_activities_list.rhtml
+++ b/app/views/profile/_profile_activities_list.rhtml
@@ -8,3 +8,9 @@
     <% end %>
   <% end %>
 <% end %>
+
+<% if activities.current_page < activities.total_pages %>
+  <div id='profile_activities_page_<%= activities.current_page %>'>
+    <%= button_to_remote :add, _('View more'), :url => {:action => 'view_more_activities', :page => (activities.current_page + 1)}, :update => "profile_activities_page_#{activities.current_page}" %>
+  </div>
+<% end %>
diff --git a/app/views/profile/_profile_activity.rhtml b/app/views/profile/_profile_activity.rhtml
index fbf2ca0..a300225 100644
--- a/app/views/profile/_profile_activity.rhtml
+++ b/app/views/profile/_profile_activity.rhtml
@@ -1,11 +1,4 @@
 <li class='profile-activity-item <%= activity.verb %>' id='profile-activity-item-<%= activity.id %>'>
   <%= render :partial => activity.verb, :locals => { :activity => activity }%>
   <hr />
-
-  <ul class="profile-wall-activities-comments" style='padding-left: 50px;width:auto'>
-    <%= render :partial => 'comment', :collection => activity.comments %>
-  </ul>
-
-  <%= render :partial => 'profile_comment_form', :locals => { :activity => activity } %> 
-
 </li>
diff --git a/app/views/profile/_profile_scrap.rhtml b/app/views/profile/_profile_scrap.rhtml
index dd9db38..bb59872 100644
--- a/app/views/profile/_profile_scrap.rhtml
+++ b/app/views/profile/_profile_scrap.rhtml
@@ -9,30 +9,17 @@
     <div class='profile-wall-actions'>
     <% if logged_in? && current_person.follows?(scrap.sender) %>
       <span class='profile-activity-send-reply'>
-        <%= link_to_function _('Comment'), "hide_and_show(['#profile-wall-reply-response-#{scrap.id}'],['#profile-wall-reply-#{scrap.id}', '#profile-wall-reply-form-#{scrap.id}']);$('reply_content_#{scrap.id}').value='';$('reply_content_#{scrap.id}').focus();$('scrap_id_#{scrap.id}').value='#{scrap.id}';return false", :class => "profile-send-reply" %>
+        <%= link_to_function s_('profile|Comment'), "hide_and_show(['#profile-wall-message-response-#{scrap.id}'],['#profile-wall-reply-#{scrap.id}', '#profile-wall-reply-form-#{scrap.id}']);$('reply_content_#{scrap.id}').value='';$('reply_content_#{scrap.id}').focus();return false", :class => "profile-send-reply" %>
       </span>
     <% end %>
     <%= link_to_remote(content_tag(:span, _('Remove')), :confirm => _('Are you sure?'), :url =>{:action => 'remove_scrap', :scrap_id => scrap.id}, :update => "profile-activity-item-#{scrap.id}") if logged_in? && user.can_control_scrap?(scrap) %>
     </div>
   </div>
-  <ul class="profile-activity-scrap-replies">
+  <ul class="profile-wall-activities-comments scrap-replies" style='width: auto;'>
     <% scrap.replies.map do |reply| %>
       <%= render :partial => 'profile_scrap', :locals => {:scrap => reply} %>
     <% end %>
   </ul>
-  <div id='profile-activity-message-<%= scrap.id%>' style='display:none;'>
-    <div id='profile-activity-form-<%= scrap.id%>' style='display:none;'>
-      <p class='profile-activity-message'>
-        <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap', :not_load_scraps => true}, :update => "profile-activity-message-response-#{scrap.id}", :success =>"hide_and_show(['#profile-activity-form-#{scrap.id}'],['#profile-activity-message-response-#{scrap.id}'])" do %>
-          <%= limited_text_area :scrap, :content, 420, "content_#{scrap.id}", :cols => 50, :rows => 2 %>
-          <%= hidden_field_tag 'receiver_id', scrap.sender.id %>
-          <%= submit_button :add, _('Leave a scrap') %>
-          <%= button_to_function :cancel, _('Cancel'), "hide_and_show(['#profile-activity-message-#{scrap.id}'],[]);return false" %>
-        <% end %>
-      </p>
-    </div>
-    <div id='profile-activity-message-response-<%=scrap.id%>' class='profile-activity-message-response'></div>
-  </div>
   <%= render :partial => 'profile_scrap_reply_form', :locals => { :scrap => scrap } %>
   <hr />  
 </li>
diff --git a/app/views/profile/_profile_scrap_reply_form.rhtml b/app/views/profile/_profile_scrap_reply_form.rhtml
index d3784e5..273eb86 100644
--- a/app/views/profile/_profile_scrap_reply_form.rhtml
+++ b/app/views/profile/_profile_scrap_reply_form.rhtml
@@ -1,16 +1,17 @@
-<div id='profile-wall-reply-<%= scrap.id%>' style='display:none;'>
-  <div id='profile-wall-reply-form-<%= scrap.id%>' style='display:none;'>
+<div id='profile-wall-reply-<%= scrap.id%>' style='display:none'>
+  <div id='profile-wall-reply-form-<%= scrap.id%>' style='display:none'>
     <p class='profile-wall-reply'>
-      <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap'}, :update => "profile_activities", :success =>"hide_and_show(['#profile-wall-reply-form-#{scrap.id}'],['#profile-wall-reply-response-#{scrap.id}'])" do %>
+      <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap'}, :update => "profile_activities", :html => { :class => 'profile-wall-reply-form'} do %>
         <%= text_area :scrap, :content, { :id => "reply_content_#{scrap.id}",
                                           :cols => 50,
                                           :rows => 1,
                                           :class => 'submit-with-keypress',
+                                          :title => _('Leave your comment'),
                                           :onfocus => ('if(this.value==this.title){this.value="";this.style.color="#000"};this.style.backgroundImage="url(' + profile_icon(current_person, :icon, false) + ')"' if logged_in?),
                                           :onblur => ('if(this.value==""){this.value=this.title;this.style.color="#ccc"};this.style.backgroundImage="none"' if logged_in?),
-
+                                        :value => _('Leave your comment')
                                         } %>
-        <%= hidden_field :scrap, :scrap_id, :id => "scrap_id_#{scrap.id}" %>
+        <%= hidden_field_tag 'scrap[scrap_id]', scrap.id %>
         <%= hidden_field_tag 'receiver_id', scrap.sender.id %>
       <% end %>
     </p>
diff --git a/app/views/profile/_profile_wall.rhtml b/app/views/profile/_profile_wall.rhtml
index be8c267..f0601f9 100644
--- a/app/views/profile/_profile_wall.rhtml
+++ b/app/views/profile/_profile_wall.rhtml
@@ -3,16 +3,10 @@
   <%= flash[:error] %>
   <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap', :tab_action => 'wall' }, :update => 'profile_activities', :success => "$('leave_scrap_content').value=''" do %>
     <%= limited_text_area :scrap, :content, 420, 'leave_scrap_content', :cols => 50, :rows => 2 %>
-    <%= submit_button :scrap, _('Share') %>
+    <%= submit_button :new, _('Share') %>
   <% end %>
 </div>
 <div id='leave_scrap_response'></div>
-<ul id='profile_activities'>
+<ul id='profile_activities' class='profile-activities'>
   <%= render :partial => 'profile_activities_list', :locals => {:activities => @activities} %>
 </ul>
-
-<% if @activities.current_page < @activities.total_pages %>
-  <div id='profile_activities_page_<%= @activities.current_page %>'>
-    <%= button_to_remote :add, _('View more'), :url => {:action => 'view_more_activities', :page => (@activities.current_page + 1)}, :update => "profile_activities_page_#{@activities.current_page}" %>
-  </div>
-<% end %>
diff --git a/app/views/profile/_update_article.rhtml b/app/views/profile/_update_article.rhtml
index 118a275..aec088a 100644
--- a/app/views/profile/_update_article.rhtml
+++ b/app/views/profile/_update_article.rhtml
@@ -1 +1 @@
-<%= render :partial => 'default_activity', :locals => {:activity => activity} %>
+NAO É PRA APARECER
diff --git a/app/views/profile/_upload_image.rhtml b/app/views/profile/_upload_image.rhtml
index 7d2a986..c65a1ae 100644
--- a/app/views/profile/_upload_image.rhtml
+++ b/app/views/profile/_upload_image.rhtml
@@ -1,4 +1,25 @@
 <div class="activity-gallery-images-count-<%= activity.get_view_url.size %>">
-  <%= render :partial => 'default_activity', :locals => {:activity => activity} %>
+  <div class='profile-activity-image'>
+    <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
+  </div>
+  <div class='profile-activity-description'>
+    <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
+    <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
+    <div class='profile-wall-actions'>
+      <%= link_to_function(s_('profile|Comment'), "$('reply_content_#{activity.id}').focus()") unless activity.get_view_url.size == 1 %>
+      <%= link_to_remote(content_tag(:span, _('Remove')), :confirm => _('Are you sure?'), :url =>{:action => 'remove_activity', :activity_id => activity.id}, :update => "profile-activity-item-#{activity.id}") if logged_in? && current_person == @profile %>
+    </div>
+  </div>
 </div>
 <div title='<%= activity.target.class.short_description %>' class='profile-activity-icon icon-new icon-newgallery'></div>
+
+<% if activity.get_view_url.size == 1 %>
+  <hr />
+  <ul class="profile-wall-activities-comments comments-count-<%= activity.comments_count %>" >
+    <%= render :partial => 'comment', :collection => activity.comments %>
+  </ul>
+
+  <%= render :partial => 'profile_comment_form', :locals => { :activity => activity } %>
+<% end %>
+
+<br/>
diff --git a/config/initializers/action_tracker.rb b/config/initializers/action_tracker.rb
index 7ee8bd9..7f23a90 100644
--- a/config/initializers/action_tracker.rb
+++ b/config/initializers/action_tracker.rb
@@ -23,7 +23,7 @@ ActionTrackerConfig.verbs = {
   },
 
   :upload_image => { 
-    :description => lambda { n_('uploaded 1 image<br />%{thumbnails}<br style="clear: both;" />', 'uploaded %{num} images<br />%{thumbnails}<br style="clear: both;" />', get_view_url.size) % { :num => get_view_url.size, :thumbnails => '{{ta.collect_group_with_index(:thumbnail_path){ |t,i| content_tag(:span, image_tag(t) + link_to(nil, ta.get_view_url[i]))}.last(3).join}}' } },
+    :description => lambda { n_('uploaded 1 image<br />%{thumbnails}<br style="clear: both;" />', 'uploaded %{num} images<br />%{thumbnails}<br style="clear: both;" />', get_view_url.size) % { :num => get_view_url.size, :thumbnails => '{{ta.collect_group_with_index(:thumbnail_path){ |t,i| content_tag(:span, link_to(image_tag(t), ta.get_view_url[i]))}.last(3).join}}' } },
     :type => :groupable
   },
 
diff --git a/lib/notify_activity_to_profiles_job.rb b/lib/notify_activity_to_profiles_job.rb
index 16f96c1..dd4146a 100644
--- a/lib/notify_activity_to_profiles_job.rb
+++ b/lib/notify_activity_to_profiles_job.rb
@@ -1,10 +1,10 @@
 class NotifyActivityToProfilesJob < Struct.new(:tracked_action_id)
   NOTIFY_ONLY_COMMUNITY = [
-    'add_member_in_community',
+    'add_member_in_community'
   ]
 
   NOT_NOTIFY_COMMUNITY = [
-    'join_community',
+    'join_community'
   ]
   def perform
     return unless ActionTracker::Record.exists?(tracked_action_id)
@@ -17,6 +17,7 @@ class NotifyActivityToProfilesJob < Struct.new(:tracked_action_id)
 
     ActionTrackerNotification.create(:profile_id => tracked_action.user.id, :action_tracker_id => tracked_action.id)
 
+    #Notify all friends
     ActionTrackerNotification.connection.execute("insert into action_tracker_notifications(profile_id, action_tracker_id) select f.friend_id, #{tracked_action.id} from friendships as f where person_id=#{tracked_action.user.id} and f.friend_id not in (select atn.profile_id from action_tracker_notifications as atn where atn.action_tracker_id = #{tracked_action.id})")
 
     if target.is_a?(Community)
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 0e8a4fc..7cbdfee 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -5907,7 +5907,7 @@ h1#agenda-title {
 
 .profile-activity-lead {
   width: 370px;
-  float: right;
+  display: inline-block;
   text-align: left;
   margin: 5px 0;
 }
@@ -5958,22 +5958,29 @@ h1#agenda-title {
 }
 
 #profile-wall li.profile-activity-item.upload_image span,
-#Xprofile-wall li.profile-activity-item.upload_image span img,
 #profile-wall li.profile-activity-item.upload_image span a,
 #profile-network li.profile-activity-item.upload_image span,
-#Xprofile-network li.profile-activity-item.upload_image span img,
 #profile-network li.profile-activity-item.upload_image span a {
-  width: 120px;
+  width: 110px;
   height: 100px;
   display: block;
   overflow: hidden;
   position: absolute;
 }
 
+#profile-wall li.profile-activity-item.upload_image .activity-gallery-images-count-2 span a img,
+#profile-wall li.profile-activity-item.upload_image .activity-gallery-images-count-3 span a img,
+#profile-network li.profile-activity-item.upload_image .activity-gallery-images-count-2 span a img,
+#profile-network li.profile-activity-item.upload_image .activity-gallery-images-count-3 span a img {
+  width: 110px;
+  height: 100px;
+}
+
 #profile-wall li.profile-activity-item.upload_image .activity-gallery-images-count-1 span,
 #profile-wall li.profile-activity-item.upload_image .activity-gallery-images-count-1 span a,
+#profile-wall li.profile-activity-item.upload_image .activity-gallery-images-count-1 span a img,
 #profile-network li.profile-activity-item.upload_image .activity-gallery-images-count-1 span,
-#profile-network li.profile-activity-item.upload_image .activity-gallery-images-count-1 span a {
+#profile-network li.profile-activity-item.upload_image .activity-gallery-images-count-1 span a img {
   width: 383px;
   height: auto;
 }
@@ -5986,19 +5993,27 @@ h1#agenda-title {
 #profile-wall li.profile-activity-item.upload_image span,
 #profile-network li.profile-activity-item.upload_image span {
   position: relative;
-  float: left;
+  display: inline-block;
   margin: 5px 0px 0px 5px;
 }
 
+#profile-wall li.profile-activity-item.upload_image .profile-activity-text span,
+#profile-network li.profile-activity-item.upload_image .profile-activity-text span {
+  border: 4px solid #D2D2D2;
+  border-radius: 4px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+}
+
 #profile-wall li.profile-activity-item.upload_image span a,
 #profile-network li.profile-activity-item.upload_image span a {
-  background: transparent url(/images/gallery-image-activity-border.png) center center no-repeat;
+  Xbackground: transparent url(/images/gallery-image-activity-border.png) center center no-repeat;
   text-indent: -5000em;
 }
 
 #profile-wall li.profile-activity-item.upload_image .activity-gallery-images-count-1 span a,
 #profile-network li.profile-activity-item.upload_image .activity-gallery-images-count-1 span a {
-  background-image: url(/images/gallery-image-activity-border-big.png);
+  Xbackground-image: url(/images/gallery-image-activity-border-big.png);
   position: relative;
 }
 
@@ -6044,8 +6059,8 @@ h1#agenda-title {
   height: 16px;
   display: inline-block;
   position: absolute;
-  top: -4px;
-  right: -16px;
+  top: 0px;
+  right: 0px;
 }
 
 #profile-activity .profile-wall-scrap-replies li,
@@ -6108,7 +6123,7 @@ h1#agenda-title {
   padding-top: 0;
 }
 
-#profile_activities .profile-activity-time,
+.profile-activities .profile-activity-time,
 #profile-network .profile-activity-time,
 #profile-wall .profile-wall-time {
   font-size: 11px;
@@ -6118,7 +6133,7 @@ h1#agenda-title {
 }
 
 #profile-wall .profile-wall-send-reply,
-#profile_activities .profile-activity-time,
+.profile-activities .profile-activity-time,
 #profile-network .profile-activity-time,
 #profile-wall .profile-wall-time,
 .profile-wall-actions a {
@@ -6139,7 +6154,8 @@ h1#agenda-title {
   font-weight: normal;
 }
 
-.profile-wall-actions a:hover,
+#profile-wall li .profile-wall-actions a:hover,
+#profile-network li .profile-wall-actions a:hover,
 #profile-wall .profile-wall-send-reply a:hover {
   text-decoration: underline;
 }
@@ -6330,6 +6346,8 @@ h1#agenda-title {
 #profile-wall ul.profile-wall-activities-comments,
 #profile-network ul.profile-wall-activities-comments {
   margin-top: 35px;
+  padding-left: 50px;
+  width: auto;
 }
 
 #profile-wall .profile-wall-activities-comments li,
@@ -6582,7 +6600,7 @@ h1#agenda-title {
   width: 98%;
 }
 
-#profile_activities .profile-activity-image,
+.profile-activities .profile-activity-image,
 #profile-network .profile-activity-image,
 #profile-wall .profile-wall-image {
   width: 50px;
diff --git a/test/unit/article_test.rb b/test/unit/article_test.rb
index 5c54ead..243d495 100644
--- a/test/unit/article_test.rb
+++ b/test/unit/article_test.rb
@@ -1036,6 +1036,12 @@ class ArticleTest < ActiveSupport::TestCase
     assert_equal false, a.is_trackable?
   end
 
+  should "not be trackable if article is inside a private community" do
+    private_community = fast_create(Community, :public_profile => false)
+    a =  fast_create(TinyMceArticle, :profile_id => private_community.id)
+    assert_equal false, a.is_trackable?
+  end
+
   should 'create the notification to organization and all organization members' do
     community = fast_create(Community)
     member_1 = Person.first
diff --git a/vendor/plugins/access_control/lib/role_assignment.rb b/vendor/plugins/access_control/lib/role_assignment.rb
index c55d692..731aa0b 100644
--- a/vendor/plugins/access_control/lib/role_assignment.rb
+++ b/vendor/plugins/access_control/lib/role_assignment.rb
@@ -7,7 +7,7 @@ class RoleAssignment < ActiveRecord::Base
   
   track_actions :join_community, :after_create, :keep_params => ["resource.name", "resource.url", "resource.profile_custom_icon"], :if => Proc.new { |x| x.resource.is_a?(Community) && x.accessor.role_assignments.count(:conditions => { :resource_id => x.resource.id, :resource_type => 'Profile' }) == 1 }, :custom_user => :accessor, :custom_target => :resource
   
-  track_actions :add_member_in_community, :after_create, :if => Proc.new { |x| x.resource.is_a?(Community) && x.accessor.role_assignments.count(:conditions => { :resource_id => x.resource.id, :resource_type => 'Profile' }) == 1 }, :custom_user => :accessor, :custom_target => :resource
+#  track_actions :add_member_in_community, :after_create, :if => Proc.new { |x| x.resource.is_a?(Community) && x.accessor.role_assignments.count(:conditions => { :resource_id => x.resource.id, :resource_type => 'Profile' }) == 1 }, :custom_user => :accessor, :custom_target => :resource
   
   def has_permission?(perm, res)
     return false unless role.has_permission?(perm.to_s) && (resource || is_global)
--
libgit2 0.21.2