diff --git a/level_omega/appointment_field.tpl.php b/level_omega/appointment_field.tpl.php
index 3fa086a..59cac4d 100644
--- a/level_omega/appointment_field.tpl.php
+++ b/level_omega/appointment_field.tpl.php
@@ -18,8 +18,9 @@
  * 
  */
 ?>
-
-<div <?php print drupal_attributes($field['#attributes'])?>>
-<h3><?php print $field['#title']?>:</h3>
-<p><span><?php print $field['#value']?></span></p>
-</div>
\ No newline at end of file
+<?php if (isset($field['#value']) && $field['#value'] != ""): ?>
+  <div <?php print drupal_attributes($field['#attributes'])?>>
+  <h3><?php print $field['#title']?>:</h3>
+  <p><span><?php print $field['#value']?></span></p>
+  </div>
+<?php endif;?>
\ No newline at end of file
diff --git a/level_omega/block.tpl.php b/level_omega/block.tpl.php
index bfa943a..008e1c4 100644
--- a/level_omega/block.tpl.php
+++ b/level_omega/block.tpl.php
@@ -33,6 +33,6 @@
 <?php endif;?>
 
   <div class="content">
-    <?php print $block->content ?>
+    <?php print $block->content; ?>
   </div>
 </div>
\ No newline at end of file
diff --git a/level_omega/page-user.tpl.php b/level_omega/page-user.tpl.php
deleted file mode 100644
index e9e8a8f..0000000
--- a/level_omega/page-user.tpl.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-// $Id: page.tpl.php,v 1.1.2.16 2010/11/16 14:39:39 himerus Exp $
-?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-      xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-      xmlns:xsd="http://www.w3.org/2001/XMLSchema#"
-      xmlns:gr="http://purl.org/goodrelations/v1#"
-      xmlns:foaf="http://xmlns.com/foaf/0.1/"
-      xmlns:vcard="http://www.w3.org/2006/vcard/ns#"
-      xmlns:og="http://ogp.me/ns#"
-      xmlns:fb="http://www.facebook.com/2008/fbml"
-      xmlns:v="http://rdf.data-vocabulary.org/#"
-      xml:lang="<?php print $language->language ?>" lang="<?php print $language->language ?>" dir="<?php print $language->dir ?>">
-
-<head>
-  <title><?php print $head_title; ?></title>
-  <?php print $head; ?>
-  <?php print $styles; ?>
-  <?php print $scripts; ?>
-  <meta name="google-site-verification" content="pZgSESN5QxVKkNG8sfYvuTkAG_sSYMh6IyN0em74Gso" />
-  <meta property="og:site_name" content="Level Business" />
-  <meta property="fb:app_id" content="206040062739797" />
-  <meta property="og:image" content="http://<?php print $_SERVER['HTTP_HOST'] . '/' . drupal_get_path('theme','level_omega'); ?>/images/level_fb_like.png" />  
-  <?php 
-  // TODO: add fb_app id and fb_admins as system variables 
-  // TODO, we can get some of the types from the SIC code for bars, hotes etc. 
-  // TODO move this to a seperate module
-    if (arg(1) == 'company') {
-      global $base_root;
-      $path = $base_root . request_uri();
-      print '<meta property="description" content="Company details for ' . $title .'" />';
-      print '<meta property="og:type" content="company" />';
-      print '<meta property="og:title" content="'. trim($title) . '" />';
-     // TODO: change this to be just http://levelbusiness.com
-      print '<meta property="og:url" content="http://'. $_SERVER['HTTP_HOST'] . request_uri() .'" />';
-    }
-    if (arg(1) == 'person') {
-      global $base_root;
-      $path = $base_root . request_uri();
-      print '<meta property="description" content="Details of ' . $title .'" />';
-      print '<meta property="og:type" content="public_figure" />';
-      print '<meta property="og:title" content="'. trim($title) . '" />';
-     // TODO: change this to be just http://levelbusiness.com
-      print '<meta property="og:url" content="http://'. $_SERVER['HTTP_HOST'] . request_uri() .'" />';
-      
-    }
-  ?> 
-</head>
-
-<body class="<?php print $body_classes; ?>">
-
-  <?php if($help || $messages): ?>
-    <div id="system_messages">
-       <?php print $help; ?>
-       <?php print $messages; ?>
-    </div><!-- /.container-xx -->
-  <?php endif; ?>   
-           
-  <?php if (!empty($admin)) print $admin; ?>
-  <div id="page" class="clearfix">
-
-  <div id="header_container" class="container_4 clearfix">
-    <div id="site-header" class="grid_4 alpha">
-      <div id="branding" class="grid_1 alpha omega">
-        <?php //if ($linked_logo_img): ?>
-          <?php //print $linked_logo_img; ?>
-        <?php //endif; ?>
-        <?php //if ($linked_site_name): ?>
-          <?php //if ($title): ?>
-            <!-- h2 id="site-name" class=""><?php //print $linked_site_name; ?></h2 -->
-          <?php //else: ?>
-            <!-- h2 id="site-name" class=""><?php //print $linked_site_name; ?></h2 -->
-          <?php //endif; ?>
-        <?php //endif; ?>
-        <a href="http://<?php print $_SERVER['HTTP_HOST'] ?>"><img src="/<?php print drupal_get_path('theme','level_omega'); ?>/images/Logo.png" alt="Level business logo" /></a>
-      </div><!-- /#branding -->
-       <?php
-       if (isset($primary_links)) {
-         print theme('links', $primary_links, array('class' => 'links primary-links'));
-       }
-       if ($header_last) {
-         print $header_last;
-       }
-      ?>
-    </div>
-  </div>
-
-  <?php if (!empty($page_tools)): ?>           
-    <div id="page_tools" class="container_4 clearfix">
-      <?php print $page_tools; ?>
-    </div>
-  <?php endif; ?>
-
-  <div id="content" class="container_4 clearfix">
-
-
-
-<div id="main_content_container" class="grid_4 clearfix alpha omega" <?php print drupal_attributes($main_content_attributes); ?>>
-  <?php if($top_bar || $title):
-      /* top_bar can be used for bold page titles such as company
-       * names on the company profile page. It will allways span 
-       * the page after the left column.
-       */
-     
-     ?>
-     <div id="top_bar" class="clearfix">
-     <?php  if ($top_bar || arg(1) == 'person'): // TOP bar used in place of standard page title ?>
-        <?php print $top_bar; ?>
-     <?php else:?>
-       <h1 class="title" id="page-title"><?php print $obj['title']; ?></h1>
-     <?php endif;  ?>       
-     </div>
-   <?php endif; ?>
-
-   <?php //Calculate suffix (TODO: put in preprocess function)
-   
-   if ($right_sidebar) {
-     $content_classes = "grid_3 alpha";
-    }
-    else {
-      $content_classes = "grid_4 alpha omega";
-    }
-   ?>
-
-   <div id="main_wrapper" class="<?php print $content_classes; ?> clearfix">
-   
-    <?php if ($obj['tabs']): ?>
-       <div id="content-tabs" class=""><?php print $obj['tabs']; ?></div><!-- /#content-tabs -->
-     <?php endif; ?>
- 
-     <?php if($content_top): ?>
-       <div id="content-top">
-          <?php print $content_top; ?>
-       </div><!-- /#content-top -->
-      <?php endif; ?>
- 
-      <div id="main-content">
-        <?php print $obj['content']; ?>
-      </div><!-- /#main-content -->
-      <?php if($content_bottom): ?>
-        <div id="content-bottom">
-          <?php print $content_bottom; ?>
-        </div><!-- /#content-bottom -->
-      <?php endif; ?>
-    </div><!-- /#main-wrapper -->   
-
-
-   <?php if($right_sidebar): ?>
-      <div id="right_sidebar" class="grid_1 omega">
-	    <?print $right_sidebar ?>
-       </div>
-   <?php endif;?> 
-
-
-</div>
-
-</div>
-                
-
-<div id="footer_wrapper" class="container_4 clearfix">
- 
- <div id="footer_main" class="grid_4 clearfix alpha">
-  <?php if($footer) {
-            print $footer;
-          }?>
-</div>
-</div>
-</div><!-- /page -->
-  <?php print $closure; ?>
-   <script>
-     FB.XFBML.parse();
-   </script>          
-</body>
-</html>
\ No newline at end of file
diff --git a/level_omega/template.php b/level_omega/template.php
index 1f65ee5..d258c30 100644
--- a/level_omega/template.php
+++ b/level_omega/template.php
@@ -94,14 +94,6 @@ function level_omega_preprocess(&$vars, $hook) {
           $company_name = $vars['view']->result[0]->name;
         }
       }
-      if($vars['name'] == "director_profile") {
-        if ($vars['view']->result[0]->name) {
-          drupal_set_title($vars['view']->result[0]->name . ' director profile');
-          global $director_name;
-          $director_name = $vars['view']->result[0]->name;
-        }
-       
-     }
 
      if ($vars['name'] == 'ch_solr_transactions') {
         // Get the date and set the title if the view is one of the main blocks
@@ -363,6 +355,15 @@ function level_omega_apachesolr_unclick_link($facet_text, $path, $options = arra
   return   apachesolr_l('<div class="link_text">' . $facet_text . '</div> (remove)', $path, $options);
 }
 
+function level_omega_preprocess_user_profile_item(&$variables) {
+  // Hide empty profile items
+  if ($variables['value'] == NULL) {
+    $variables['value'] = "N/A";
+  }  
+}
+
+
+
 function level_omega_form_element($element, $value) {
   // This is also used in the installer, pre-database setup.
   $t = get_t();
diff --git a/level_omega/user-profile-category.tpl.php b/level_omega/user-profile-category.tpl.php
index 7670242..ef6c01a 100644
--- a/level_omega/user-profile-category.tpl.php
+++ b/level_omega/user-profile-category.tpl.php
@@ -28,6 +28,6 @@
   <h3><?php print $title; ?></h3>
 <?php endif; ?>
 
-<div class="profile-catagory">
+<div <?php print $attributes; ?>>
   <?php print $profile_items; ?>
 </div>
diff --git a/level_omega/user-profile-item.tpl.php b/level_omega/user-profile-item.tpl.php
index 2635249..7388865 100644
--- a/level_omega/user-profile-item.tpl.php
+++ b/level_omega/user-profile-item.tpl.php
@@ -24,5 +24,5 @@
 ?>
 <div <?php print $attributes; ?>>
   <h4 class="identification-title"><?php print $title; ?></h4>
-  <div class="identification-content"><?php print $value; ?></div>
-</div>
+  <div class="content"><span><?php print $value; ?></span></div>
+</div>
\ No newline at end of file
diff --git a/level_omega/user-profile.tpl.php b/level_omega/user-profile.tpl.php
index 045b7b0..dd33849 100644
--- a/level_omega/user-profile.tpl.php
+++ b/level_omega/user-profile.tpl.php
@@ -41,50 +41,10 @@
  */
 ?>
 <?php if (!$account->hide_profile): ?>
-  <?php profile_load_profile($account); ?>
-
-  <h1 id="profile-title"><?php print ucwords(strtolower($account->name)); ?><?php print check_plain($account->profile_age['#value']); ?></h1>
-
-  <div class="profile clear-block">
-
-    <div class="linkedin_additional clear-block">
-      <?php print $account->content['linkedin_additional']['options']['#value']; ?>
-    </div>
   
-    <?php if (isset($account->content['identification'])): ?>
-      <div class="identification clear-block">
-        <div class="identification-top clear-block">
-          <div <?php print drupal_attributes($account->content['identification']['profile_nationality']['#attributes']); ?>>
-            <h4><?php print check_plain($account->content['identification']['profile_nationality']['#title']); ?></h4>
-            <div class="content"><span><?php print check_plain($account->content['identification']['profile_nationality']['#value']); ?></span></div>
-          </div>
-             
-          <div <?php print drupal_attributes($account->content['identification']['profile_date_of_birth']['#attributes']); ?>>
-            <h4>Date of Birth</h4>
-            <div class="content"><span><?php print check_plain($account->content['identification']['profile_date_of_birth']['#value']); ?></span></div>
-          </div>
-
-          <div <?php print drupal_attributes($account->content['identification']['profile_age']['#attributes']); ?>>
-            <h4><?php print check_plain($account->content['identification']['profile_age']['#title']); ?></h4>
-            <div class="content"><span><?php print check_plain($account->content['identification']['profile_age']['#value']); ?> years</span></div>
-          </div>
-        </div>
+  <h1 id="profile-title"><?php print ucwords(strtolower($account->name)); ?><?php print check_plain($account->profile_age['#value']); ?></h1>
 
-        <div <?php print drupal_attributes($account->content['identification']['profile_occupation']['#attributes']); ?>>
-          <h4><?php print check_plain($account->content['identification']['profile_occupation']['#title']); ?></h4>
-          <div class="content"><span><?php print check_plain($account->content['identification']['profile_occupation']['#value']); ?></span></div>
-        </div>
-    
-        <div <?php print drupal_attributes($account->content['identification']['profile_address']['#attributes']); ?>>
-          <h4><?php print check_plain($account->content['identification']['profile_address']['#title']); ?></h4>
-          <div class="content"><span><?php print check_plain($account->content['identification']['profile_address']['#value']); ?></span></div>
-        </div>
-      </div><!--/ .identification -->
-  
-      <div class="appointments clear-block">
-        <?php print $profile['appointments']; ?>
-      </div>
-  
-    <?php endif ?>
+  <div class="profile">
+   <?php print $user_profile ?>     
   </div>
 <?php endif ?>
