diff --git a/app/models/person.rb b/app/models/person.rb
index e83d416..1a9a740 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -27,7 +27,7 @@ class Person < Profile
   end
 
   N_('Contact information'); N_('Birth date'); N_('City'); N_('State'); N_('Country'); N_('Sex');
-  settings_items :photo, :contact_information, :birth_date, :sex, :city, :state, :country
+  settings_items :photo, :contact_information, :birth_date, :sex, :city, :state, :country, :zip_code
 
   def self.conditions_for_profiles(conditions, person)
     new_conditions = sanitize_sql(['role_assignments.accessor_id = ?', person])
diff --git a/app/views/profile_editor/_organization.rhtml b/app/views/profile_editor/_organization.rhtml
index 96def6c..4bc3978 100644
--- a/app/views/profile_editor/_organization.rhtml
+++ b/app/views/profile_editor/_organization.rhtml
@@ -1,8 +1,12 @@
-  <div class="formfieldline">
+<h2><%= _('General information') %></h2>
+
+<div class="formfieldline">
   <label class="formlabel" for="profile_data_nickname"><%= _('Display name') %></label>
   <div class="formfield type-text">
-  <%= text_field_tag 'profile_data[nickname]', @profile_data.nickname, :id => 'profile_data_nickname', :size => 30, :maxlength => 16 %>
-  </div>
+    <%= text_field_tag 'profile_data[nickname]', @profile_data.nickname, :id => 'profile_data_nickname', :size => 30, :maxlength => 16 %>
+    <em><%= _('A short name by which the organization is know.')%></em>
+</div>
+
   </div>
   <%= f.text_field(:acronym) %>
   <%= f.text_field(:foundation_year) %>
diff --git a/app/views/profile_editor/_person.rhtml b/app/views/profile_editor/_person.rhtml
index 5aec4f0..31ce177 100644
--- a/app/views/profile_editor/_person.rhtml
+++ b/app/views/profile_editor/_person.rhtml
@@ -1,11 +1,20 @@
+<h2><%= _('Personal information') %></h2>
+
+
   <%= f.text_field(:nickname, :maxlength => 16, :size => 30) %>
+  <div>
+    <small><em><%= _('A short name by which you like to be known. Will be used in friends listings, community member listings etc.') %></em></small>
+  </div>
+
+
   <%= f.text_field(:name) %>
   <%= f.text_field(:contact_information) %>
   <%= f.text_field(:contact_phone) %>
   <%# use :size => 3 if you want 3 radios by line %>
   <%= f.radio_group :profile_data, :sex, [ ['male',_('Male')], ['female',_('Female')] ] %>
   <%= f.text_field(:birth_date) %>
-  <%= f.text_field(:address) %>
+  <%= labelled_form_field(_('Address (street and number)'), text_field(:profile_data, :address)) %>
+  <%= labelled_form_field(_('ZIP code'), text_field(:profile_data, :zip_code)) %>
   <%= f.text_field(:city) %>
   <%= f.text_field(:state) %>
   <%= f.text_field(:country) %>
diff --git a/app/views/profile_editor/edit.rhtml b/app/views/profile_editor/edit.rhtml
index e174caf..258781d 100644
--- a/app/views/profile_editor/edit.rhtml
+++ b/app/views/profile_editor/edit.rhtml
@@ -1,33 +1,36 @@
-<h1><%= _('Edit profile') %></h1>
+<h1><%= _('Profile settings') %></h1>
 
 <%= error_messages_for :profile %>
 
 <% labelled_form_for :profile_data, @profile, :html => { :multipart => true } do |f| %>
+
   <%= render :partial => partial_for_class(@profile.class), :locals => { :f => f } %>
 
   <div id="profile_change_picture">
-    <h1><%= _('Change picture') %></h1>
+    <h2><%= _('Change picture') %></h2>
     <% f.fields_for :image_builder, @profile.image do |i| %>
       <%= file_field_or_thumbnail(_('Image:'), @profile.image, i) %>
     <% end %>
   </div>
 
-  <h1><%= _('Privacy options') %></h1>
+  <h2><%= _('Privacy options') %></h2>
   <p>
     <%= _('This profile is:') %>
-    <div>
-      <%= radio_button 'profile_data', 'public_profile', 'true' %>
-      <%= _('Public') %>
-    </div>
-    <div>
-      <%= radio_button 'profile_data', 'public_profile', 'false' %>
-      <%= _('Private') %>
-    </div>
   </p>
 
   <% if profile.kind_of?(Person) %>
   <table>
-    <tr><th></th><th><%= _('Public') %></th><th><%= _('Private')  %></th></tr>
+    <tr>
+      <th></th>
+      <th>
+        <%= radio_button 'profile_data', 'public_profile', 'true' %>
+        <label for="profile_data_public_profile_true"><u><%= _('Public') %></u></a>
+      </th>
+      <th style='padding: 2px 10px 2px 2px;'>
+        <%= radio_button 'profile_data', 'public_profile', 'false' %>
+        <label for="profile_data_public_profile_false"><u><%= _('Private') %></u></a>
+      </th>
+    </tr>
     <tr>
       <td> <%= _('Activate Intranet access (restricted area only for me)') %> </td><td><%= _('Yes') %></td><td><%= _('Yes') %></td>
     </tr>
@@ -59,7 +62,7 @@
   </table>
   <% end %>
 
-  <%= select_categories(:profile_data, _('Select the categories of your interest'), 1) %>
+  <%= select_categories(:profile_data, _('Select the categories of your interest'), 2) %>
 
   <% button_bar do %>
     <%= submit_button('save', _('Save'), :cancel => {:action => 'index'}) %>
diff --git a/app/views/profile_editor/index.rhtml b/app/views/profile_editor/index.rhtml
index dbaa9e8..8e2e1f4 100644
--- a/app/views/profile_editor/index.rhtml
+++ b/app/views/profile_editor/index.rhtml
@@ -8,7 +8,7 @@
 
 <% file_manager do %>
 
-  <%= file_manager_button(_('Edit Profile'), 'icons-app/edit-profile.png', :controller => 'profile_editor', :action => 'edit') %>
+  <%= file_manager_button(_('Profile settings'), 'icons-app/edit-profile.png', :controller => 'profile_editor', :action => 'edit') %>
 
   <%= file_manager_button(_('Mail settings'), 'icons-app/mail.png', :controller => 'mailconf') if profile.person? && MailConf.enabled? %>
 
diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index b0d67a6..22de4c7 100644
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -228,6 +228,7 @@ table {
 }
 th, td {
   font-size: 14px;
+  padding: 2px 10px;
 }
 th {
   font-weight: bold;
diff --git a/test/unit/person_test.rb b/test/unit/person_test.rb
index 3f01e1c..e0d0f4e 100644
--- a/test/unit/person_test.rb
+++ b/test/unit/person_test.rb
@@ -68,7 +68,7 @@ class PersonTest < Test::Unit::TestCase
 
   should "have person info fields" do
     p = Person.new
-    [ :name, :photo, :contact_information, :birth_date, :sex, :address, :city, :state, :country ].each do |i|
+    [ :name, :photo, :contact_information, :birth_date, :sex, :address, :city, :state, :country, :zip_code ].each do |i|
       assert_respond_to p, i
     end
   end
--
libgit2 0.21.2