diff --git a/src/noosfero-spb/software_communities/views/blocks/download.html.erb b/src/noosfero-spb/software_communities/views/blocks/download.html.erb
index 0bb2aa6..4e8e5ca 100644
--- a/src/noosfero-spb/software_communities/views/blocks/download.html.erb
+++ b/src/noosfero-spb/software_communities/views/blocks/download.html.erb
@@ -1,25 +1,21 @@
-<% if block.owner.software_info.nil? %>
-  <%= _("This community needs a software to use this block") %>
-<% else %>
-    <h3 class="block-title"> <%= _("Download #{block.owner.software_info.software.name}") %> </h3>
-    <ul class="download-list">
-    <% block.downloads.each_with_index do |download, index| %>
-      <li id="download-item-<%=(index+1)%>">
-        <div class="download-button">
-          <%= link_to :controller => 'software_communities_plugin_profile', :action=> 'download_file', :block=>block.id, :download_index=> index , title: _("Download the software") do %>
+<h3 class="block-title"> <%= _("Download #{block.owner.name}") %> </h3>
+<ul class="download-list">
+  <% block.downloads.each_with_index do |download, index| %>
+    <li id="download-item-<%=(index+1)%>">
+      <div class="download-button">
+        <%= link_to :controller => 'software_communities_plugin_profile', :action=> 'download_file', :block=>block.id, :download_index=> index , title: _("Download the software") do %>
           <span class="download-image"></span>
           <span class="download-size"><%= download[:size] %></span>
-          <% end %>
-        </div>
-        <div class="download-info">
-          <span class="download-name"><%= _("#{download[:name]}") %></span>
-          <span class="download-platform"><%= _("Platform:#{download[:software_description]}") %> </span>
-          <span class="min-requirements"><%= link_to _("Minimum Requirements"), download[:minimum_requirements] %></span>
-        </div>
-      </li>
-    <% end %>
-    </ul>
-    <div id="licensed-software">
-      <%= link_to _("License: #{block.owner.software_info.license_info.version}"), block.owner.software_info.license_info.link %>
-  </div>
-<% end %>
+        <% end %>
+      </div>
+      <div class="download-info">
+        <span class="download-name"><%= _("#{download[:name]}") %></span>
+        <span class="download-platform"><%= _("Platform:#{download[:software_description]}") %> </span>
+        <span class="min-requirements"><%= link_to _("Minimum Requirements"), download[:minimum_requirements] %></span>
+      </div>
+    </li>
+  <% end %>
+</ul>
+<div id="licensed-software">
+  <%= link_to _("License: #{block.owner.software_info.license_info.version}"), block.owner.software_info.license_info.link %>
+</div>
diff --git a/src/noosfero-spb/software_communities/views/blocks/repository.html.erb b/src/noosfero-spb/software_communities/views/blocks/repository.html.erb
index dd9817d..60105c9 100644
--- a/src/noosfero-spb/software_communities/views/blocks/repository.html.erb
+++ b/src/noosfero-spb/software_communities/views/blocks/repository.html.erb
@@ -1,5 +1 @@
-<% if block.owner.software_info.nil? %>
-  <%= _("This community needs a software to use this block") %>
-<% else %>
-  <%= link_to _("Repository") , block.owner.software_info.repository_link, :id => "bt_repositorio", :target => "_blank" %>
-<% end %>
+<%= link_to _("Repository") , block.owner.software_info.repository_link, :id => "bt_repositorio", :target => "_blank" %>
diff --git a/src/noosfero-spb/software_communities/views/blocks/software_information.html.erb b/src/noosfero-spb/software_communities/views/blocks/software_information.html.erb
index dd82bea..c9ed867 100644
--- a/src/noosfero-spb/software_communities/views/blocks/software_information.html.erb
+++ b/src/noosfero-spb/software_communities/views/blocks/software_information.html.erb
@@ -1,8 +1,4 @@
 <div class="vcard">
-
-<% if block.owner.software_info.nil? %>
-  <%= _("This community needs a software to use this block") %>
-<% else %>
   <table id="software-information-block-table">
     <tr>
       <td width="30%" id="col-profile-big-image">
@@ -32,5 +28,4 @@
       </td>
     </tr>
   </table>
-<% end %>
 </div>
diff --git a/src/noosfero-spb/software_communities/views/blocks/software_tab_data.html.erb b/src/noosfero-spb/software_communities/views/blocks/software_tab_data.html.erb
index 3b0a1ce..27705a7 100644
--- a/src/noosfero-spb/software_communities/views/blocks/software_tab_data.html.erb
+++ b/src/noosfero-spb/software_communities/views/blocks/software_tab_data.html.erb
@@ -1,13 +1,8 @@
-<% if block.owner.software_info.nil? %>
-  <%= _("This community needs a software to use this block") %>
-<% else %>
-  <div id="block-community-tabs">
-    <% tabs = [] %>
-    <% tabs << {:title => _("Discussions"), :id => 'discussions-tab', :content => ""} %>
-    <% tabs << {:title => _("Blog"), :id => 'blog-tab', :content => (render partial: "blocks/software_tab_blog", :locals => {block: block})} %>
-    <% tabs << {:title => _("Repository Feed"), :id => 'repository-feed-tab', :content => ""} %>
-
-    <%= render_tabs(tabs) %>
-  </div>
-<% end %>
+<div id="block-community-tabs">
+  <% tabs = [] %>
+  <% tabs << {:title => _("Discussions"), :id => 'discussions-tab', :content => ""} %>
+  <% tabs << {:title => _("Blog"), :id => 'blog-tab', :content => (render partial: "blocks/software_tab_blog", :locals => {block: block})} %>
+  <% tabs << {:title => _("Repository Feed"), :id => 'repository-feed-tab', :content => ""} %>
 
+  <%= render_tabs(tabs) %>
+</div>
diff --git a/src/noosfero-spb/software_communities/views/blocks/wiki.html.erb b/src/noosfero-spb/software_communities/views/blocks/wiki.html.erb
index 24cda6f..156ee38 100644
--- a/src/noosfero-spb/software_communities/views/blocks/wiki.html.erb
+++ b/src/noosfero-spb/software_communities/views/blocks/wiki.html.erb
@@ -1,6 +1,2 @@
-<% if block.owner.software_info.nil? %>
-  <%= _("This community needs a software to use this block") %>
-<% else %>
-  <%= link_to _("Wiki") , block.wiki_link, :id => "bt_wiki", :target => "_blank" %>
-<% end %>
+<%= link_to _("Wiki") , block.wiki_link, :id => "bt_wiki", :target => "_blank" %>
 
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 cadab2d..2cc4f28 100644
--- a/src/noosfero-spb/software_communities/views/profile/index.html.erb
+++ b/src/noosfero-spb/software_communities/views/profile/index.html.erb
@@ -17,7 +17,7 @@
       <%= button :control_panel, _('Control Panel'), profile.admin_url %>
     </div>
   <% end %>
-  <% if profile.is_a? Community %>
+  <% if profile.is_a?(Community) || profile.is_a?(Software) %>
     <%= render "blocks/profile_info_actions/join_leave_community"  %>
   <% end %>
 </div>
diff --git a/src/noosfero-spb/software_communities/views/profile/members.html.erb b/src/noosfero-spb/software_communities/views/profile/members.html.erb
index 2b1280b..c1190e5 100644
--- a/src/noosfero-spb/software_communities/views/profile/members.html.erb
+++ b/src/noosfero-spb/software_communities/views/profile/members.html.erb
@@ -42,7 +42,7 @@
 
 <% button_bar do %>
   <%= button :back, _('Go back'), { :controller => 'profile' } %>
-  <% if profile.community? and user %>
+  <% if (profile.community? || profile.kind_of?(Software)) and user %>
     <% if user.has_permission?(:invite_members, profile) %>
       <%= button :person, _('Invite people to join'), :controller => 'invite', :action => 'invite_friends' %>
     <% end %>
--
libgit2 0.21.2