diff --git a/drupal/sites/all/modules/contrib/contextual/contextual.module b/drupal/sites/all/modules/contrib/contextual/contextual.module
index 825079e..3408e7c 100644
--- a/drupal/sites/all/modules/contrib/contextual/contextual.module
+++ b/drupal/sites/all/modules/contrib/contextual/contextual.module
@@ -125,7 +125,7 @@ function contextual_prepare_links($links) {
           $return_links[$key]['query'] += $destination_array;
         }
         // Otherwise, add the destination, unless it exists already.
-        elseif (!strtr($return_links[$key]['query'], 'destination=')) {
+        elseif (strpos($return_links[$key]['query'], 'destination=') !== FALSE) {
           $return_links[$key]['query'] .= '&' . $destination;
         }
       }
diff --git a/drupal/sites/all/modules/noc/core/noc_userspace/noc_userspace.module b/drupal/sites/all/modules/noc/core/noc_userspace/noc_userspace.module
index bb553a5..fbf5a71 100644
--- a/drupal/sites/all/modules/noc/core/noc_userspace/noc_userspace.module
+++ b/drupal/sites/all/modules/noc/core/noc_userspace/noc_userspace.module
@@ -14,7 +14,6 @@ function noc_userspace_menu() {
   if (module_exists('spaces_dashboard')) {
     $items['user/%user/dashboard'] = array(
       'title' => 'Personal Commons',
-      'title arguments' => array(1),
       'page callback' => 'noc_userspace_spaces_empty_page',
       'access callback' => 'noc_userspace_current_user',
       'access arguments' => array(1),
@@ -780,3 +779,27 @@ function noc_userspace_syndication_map_clone($node) {
   return $clone->nid;
 }
 
+/**
+ * Implementation of hook_contextual_page().
+ */
+function noc_userspace_contextual_page($page) {
+  // Contact page.
+  if (arg(0) == 'user' && user_access('moderate users') && (is_numeric(arg(1)) || !arg(1))) {
+    $links = array();
+    $uid = is_numeric(arg(1)) ? arg(1) : $user->uid;
+    $items = noc_userspace_get_user_menu($uid);
+    unset($items['user/%/dashboard']);
+    unset($items['user/%/inbox']);
+    unset($items['user/%/content']);
+    $items['user/%/portfolio']['title'] = t('Profile');
+    foreach ($items as $key => $item) {
+      $links[str_replace('/%/', '-', $key)] = array(
+        'weight' => 1,
+        'title' => check_plain($item['title']),
+        'href' => $item['href'],
+      );
+    }
+    contextual_set_links('page-actions', $links);
+    return $links;
+  }
+}
diff --git a/drupal/sites/all/themes/zero/templates/page.tpl.php b/drupal/sites/all/themes/zero/templates/page.tpl.php
index 86578de..8543471 100644
--- a/drupal/sites/all/themes/zero/templates/page.tpl.php
+++ b/drupal/sites/all/themes/zero/templates/page.tpl.php
@@ -46,9 +46,9 @@
                 <div id="site-info">
                   <div id="site-info-inner" class="clearfix region region-statusbar container">
                     <?php if ($site_name || $site_slogan || $title || $community_site_name): ?>
-                    <div id="name-and-slogan" class="unit">
+                    <div id="name-and-slogan" class="unit <?php print $page_classes ?>">
                       <?php if ($site_name || $title || $community_site_name): ?>
-                          <h1 id="site-name">
+                          <h1 id="site-name" >
                             <?php if (!$community_site_name && $site_name): ?>
                             <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home" class="site-home clear <?php print $community_site_name ? 'has-community-title' : 'no-community-title';?>"><?php print $site_name; ?></a>
                             <?php endif; ?>
diff --git a/drupal/sites/all/themes/zero/zero.info b/drupal/sites/all/themes/zero/zero.info
index a67c778..4315043 100644
--- a/drupal/sites/all/themes/zero/zero.info
+++ b/drupal/sites/all/themes/zero/zero.info
@@ -96,6 +96,7 @@ scripts[] = js/keyboard-shortcuts.js
 scripts[] = js/messages.js
 scripts[] = js/views-slideshow.js
 scripts[] = js/collapsible-menu.js
+scripts[] = js/contextual.js
 
 ; Regions
 regions[left]                  = primary sidebar