diff --git a/views/blocks/software_information.html.erb b/views/blocks/software_information.html.erb
index cdc3dd0..dd82bea 100644
--- a/views/blocks/software_information.html.erb
+++ b/views/blocks/software_information.html.erb
@@ -12,7 +12,7 @@
               <%= link_to profile_image(block.owner, :big) +"\n", profile.url %>
             </span>
             <div class='admin-link'>
-              <% if current_user && block.owner.admins.include?(current_user.person) %>
+              <% if !user.nil? && user.has_permission?('edit_profile', profile) %>
                 <%= link_to _('Control panel'), block.owner.admin_url %>
               <% end %>
             </div>
diff --git a/views/profile/index.html.erb b/views/profile/index.html.erb
new file mode 100644
index 0000000..199efef
--- /dev/null
+++ b/views/profile/index.html.erb
@@ -0,0 +1,26 @@
+<h1><%= h profile.name %></h1>
+
+<% if @action %>
+  <%= render :partial => 'private_profile' %>
+<% else %>
+  <% unless profile.description.blank? %>
+    <div class='public-profile-description'>
+      <%= profile.description %>
+    </div>
+  <% end %>
+<% end %>
+
+<div class="page-profile-header">
+  <%= render "blocks/profile_info_actions/join_leave_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 %>
+</div>
+
+<% if @profile.public? || (logged_in? && current_person.follows?(@profile)) %>
+  <table class='profile'>
+
+  </table>
+<% end %>
--
libgit2 0.21.2