diff --git a/src/noosfero-spb/noosfero-spb-theme/css/community-pages.css b/src/noosfero-spb/noosfero-spb-theme/css/community-pages.css
index 2bb770b..29512ce 100644
--- a/src/noosfero-spb/noosfero-spb-theme/css/community-pages.css
+++ b/src/noosfero-spb/noosfero-spb-theme/css/community-pages.css
@@ -8,6 +8,19 @@
   padding-bottom:30px;
   margin-bottom: 30px;
 }
+
+.action-profile-index #content .page-profile-header{
+  margin-bottom: 40px;
+  border-bottom: 1px solid #D3D6DE;
+  font-family: Arial;
+  height: 40px;
+}
+
+.action-profile-index .page-profile-header .control-panel-button{
+  float:left;
+  margin-right: 4px;
+}
+
 .action-profile-index .page-profile-header .join-leave-button.require-login-popup{
   float:left;
   width: 35%;
@@ -838,10 +851,10 @@ float: left;
 }
 
 .action-profile-members #content .page-members-header{
-  margin-bottom: 45px;
+  margin-bottom: 40px;
   border-bottom: 1px solid #D3D6DE;
   font-family: Arial;
-  height: 150px;
+  height: 140px;
 }
 
 .action-profile-members #content .page-members-header h1{
@@ -857,7 +870,6 @@ float: left;
 .action-profile-members #content .page-members-header ul li{
   float:left;
   margin:8px 0px 0px 0px;
-  width: 36%;
 
 }
 
diff --git a/src/noosfero-spb/software_communities/views/profile/index.html.erb b/src/noosfero-spb/software_communities/views/profile/index.html.erb
index 6e2d6c2..cadab2d 100644
--- a/src/noosfero-spb/software_communities/views/profile/index.html.erb
+++ b/src/noosfero-spb/software_communities/views/profile/index.html.erb
@@ -11,12 +11,15 @@
 <% end %>
 
 <div class="page-profile-header">
-  <%= render "blocks/profile_info_actions/join_leave_community" if profile.class == "Community" %>
+
   <% if !user.nil? && user.has_permission?('edit_profile', profile) %>
     <div class="control-panel-button">
       <%= button :control_panel, _('Control Panel'), profile.admin_url %>
     </div>
   <% end %>
+  <% if profile.is_a? Community %>
+    <%= render "blocks/profile_info_actions/join_leave_community"  %>
+  <% end %>
 </div>
 
 <% if @profile.public? || (logged_in? && current_person.follows?(@profile)) %>
--
libgit2 0.21.2