diff --git a/app/helpers/profile_helper.rb b/app/helpers/profile_helper.rb
index f0678df..f1fe755 100644
--- a/app/helpers/profile_helper.rb
+++ b/app/helpers/profile_helper.rb
@@ -1,3 +1,15 @@
 module ProfileHelper
 
+  def display_field(title, object, field)
+    value = object.send(field)
+    if !value.blank?
+      if block_given?
+        value = yield(value)
+      end
+      content_tag('tr', content_tag('td', title, :class => 'field-name') + content_tag('td', value))
+    else
+      ''
+    end
+  end
+
 end
diff --git a/app/helpers/tags_helper.rb b/app/helpers/tags_helper.rb
index 3f112a1..82cc8be 100644
--- a/app/helpers/tags_helper.rb
+++ b/app/helpers/tags_helper.rb
@@ -30,10 +30,10 @@ module TagsHelper
   def tag_cloud(tags, tagname_option, url, options = {})
   
 
-    return _('No tags yet.') + '<br/>' +
-           '<a href="' + _('http://en.wikipedia.org/wiki/Tag_%28metadata%29') +
-           '" class="button with-text icon-help" target="wptags"><span>' +
-           _('What are tags?') + '</span></a>' if tags.empty?
+    return content_tag('em', _('No tags yet.')) +
+           ' <a href="' + _('http://en.wikipedia.org/wiki/Tag_%28metadata%29') +
+           '" target="wptags"><span>(' +
+           _('What are tags?') + ')</span></a>' if tags.empty?
 
     max_size = options[:max_size] || Cloud::MAX_SIZE
     min_size = options[:min_size] || Cloud::MIN_SIZE
diff --git a/app/views/profile/_organization.rhtml b/app/views/profile/_organization.rhtml
new file mode 100644
index 0000000..cbeb29e
--- /dev/null
+++ b/app/views/profile/_organization.rhtml
@@ -0,0 +1,16 @@
+<tr>
+  <th colspan='2'><%= _('Basic information')%></th>
+</tr>
+<%= display_field(_('Name:'), profile, :name) { |name| link_to name, profile.url  } %>
+<tr>
+  <td colspan='2'>
+    <%= link_to _('Members'), :action => 'members' %></li>
+  </td>
+</tr>
+<% if profile.kind_of?(Enterprise) && !profile.environment.enabled?('disable_products_for_enterprises') %>
+  <tr>
+    <td colspan='2'>
+      <%= link_to _('Products/Services'), :controller => 'catalog', :action => 'index' %>
+    </td>
+  </tr>
+<% end %>
diff --git a/app/views/profile/_person.rhtml b/app/views/profile/_person.rhtml
new file mode 100644
index 0000000..b868823
--- /dev/null
+++ b/app/views/profile/_person.rhtml
@@ -0,0 +1,38 @@
+<tr>
+  <th colspan='2'><%= _('Basic information')%></th>
+</tr>
+<%= display_field(_('Name:'), profile, :name) { |name| link_to name, profile.url  } %>
+<%= display_field(_('Gender:'), profile, :sex) { |gender| { 'male' => _('Male'), 'female' => _('Female') }[gender] } %>
+<%= display_field(_('Date of birth:'), profile, :birth_date) { |date| show_date(date)  }%>
+
+<tr>
+  <th colspan='2'><%= _('Contact')%></th>
+</tr>
+<% if profile == user || profile.friends.include?(user) %>
+  <%= display_field(_('Address:'), profile, :address) %>
+  <%= display_field(_('ZIP code:'), profile, :zip_code) %>
+  <%= display_field(_('Contact phone:'), profile, :contact_phone) %>
+  <%= display_field(_('e-Mail:'), profile, :email) { |email| link_to email, 'mailto:'+email } %>
+<% end %>
+<%= display_field(_('Location:'), profile, :location) %>
+
+<tr>
+  <th colspan='2'><%= _('Work')%></th>
+</tr>
+<%= display_field(_('Organization:'), profile, :organization) %>
+<%= display_field(_('Organization website:'), profile, :organization_website) { |url| link_to(url, url) }%>
+</tr>
+
+<tr>
+  <th colspan='2'><%= _('Network')%></th>
+</tr>
+<tr>
+  <td colspan='2'>
+    <%= link_to __('Friends'), :action => 'friends' %>
+    &mdash; <%= link_to __('Communities'), :action => 'communities' %>
+    <% if !environment.enabled?('disable_asset_enterprises') %>
+      &mdash; <%= link_to __('Enterprises'), :action => 'enterprises' %>
+    <% end %>
+  </td>
+</tr>
+
diff --git a/app/views/profile/index.rhtml b/app/views/profile/index.rhtml
index 4579e21..30c3337 100644
--- a/app/views/profile/index.rhtml
+++ b/app/views/profile/index.rhtml
@@ -4,43 +4,29 @@
   </div>
 <% end %>
 
-<h2><%= _("%s's profile") % profile.identifier %></h2>
+<h1><%= _("%s's profile") % profile.identifier %></h1>
 
-<ul>
-  <li>
-    <strong><%= _('Name:') %></strong>
-    <%= profile.name %>
-  </li>
-  <li>
-    <strong><%= _('Homepage:') %></strong>
-    <%= link_to url_for(profile.url), profile.url %>
-  </li>
-
-  <%# FIXME %>
-  <% if profile.kind_of? Person %>
-    <% if profile.friends.include?(user) %>
-    <li>
-      <strong><%= _('e-Mail:') %></strong>
-      <%= content_tag 'a', profile.email, :href => 'mailto:'+profile.email %>
-    </li>
-    <% end %>
-    <li><%= link_to __('Friends'), :action => 'friends' %></li>
-    <li><%= link_to __('Communities'), :action => 'communities' %></li>
-    <li><%= link_to __('Enterprises'), :action => 'enterprises' %></li>
-  <% end %>
-  <% if profile.kind_of? Organization %>
-    <li><%= link_to _('Members'), :action => 'members' %></li>
-  <% end %>
-  <% if profile.kind_of?(Enterprise) && !profile.environment.enabled?('disable_products_for_enterprises') %>
-    <li><%= link_to _('Products/Services'), :controller => 'catalog', :action => 'index' %></li>
-  <% end %>
-
-  <li>
-  <%= link_to _('Site map'), :action => 'sitemap' %>
-  </li>
-
-  <li>
-    <%= _('Tags:') %>
-    <%= tag_cloud @tags, :id, { :action => 'tag' }, :max_size => 18, :min_size => 10%>
-  </li>
-</ul>
+<table class='profile'>
+  <%= render :partial => partial_for_class(profile.class) %>
+  <tr>
+    <th colspan='2'>
+      <%= _('Content') %>
+    </th>
+  </tr>
+  <tr>
+    <td>
+      <%= _('Content published:') %>
+    </td>
+    <td>
+      <%= link_to _('Site map'), :action => 'sitemap' %>
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <%= _('Tags:') %>
+    </td>
+    <td>
+      <%= tag_cloud @tags, :id, { :action => 'tag' }, :max_size => 18, :min_size => 10%>
+    </td>
+  </tr>
+</table>
diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index 3327969..adc1508 100644
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -276,6 +276,25 @@ td .button {
   background-color: transparent;
 }
 
+td.field-name {
+  color: #888;
+  width: 150px;
+  text-align: left;
+}
+
+table.profile th {
+  border-bottom: 2px solid #eeeeec;
+  padding: 10px 0px 0px 0px;
+}
+table.profile td {
+  border: none;
+  padding-left: 0px;
+}
+table.profile tr:hover td {
+  background: none;
+}
+
+
 /* for fields with auto-completion */
 div.auto-complete {
   display: block;
--
libgit2 0.21.2