diff --git a/include/staff/templates/user.tmpl.php b/include/staff/templates/user.tmpl.php
index 5bdf31d84788faf6976124e40d4786953de487d9..abc451170355cd27e2380240fec8f3dd2f757e30 100644
--- a/include/staff/templates/user.tmpl.php
+++ b/include/staff/templates/user.tmpl.php
@@ -19,12 +19,12 @@ if ($info['error']) {
         href="#tickets/<?php echo $ticket->getId(); ?>/change-user" ><i class="icon-user"></i> Change User</a>
     <?php
     } ?>
-    <div><b><a href="#" id="edituser"><i class="icon-edit"></i>&nbsp;<?php
-    echo Format::htmlchars($user->getName()->getOriginal()); ?></a></b></div>
-    <div>&lt;<?php echo $user->getEmail(); ?>&gt;</div>
+    <div><b><?php
+    echo Format::htmlchars($user->getName()->getOriginal()); ?></b></div>
+    <div class="faded">&lt;<?php echo $user->getEmail(); ?>&gt;</div>
     <?php
     if (($org=$user->getOrganization())) { ?>
-    <div><?php echo $org->getName(); ?></div>
+    <div style="margin-top: 7px;"><?php echo $org->getName(); ?></div>
     <?php
     } ?>
 
@@ -44,6 +44,11 @@ if ($info['error']) {
 </ul>
 
 <div class="tab_content" id="info-tab">
+<div class="floating-options">
+    <a href="#" id="edituser" class="action" title="edit"><i class="icon-edit"></i></a>
+    <a href="users.php?id=<?php echo $user->getId(); ?>" title="manage"
+        class="action no-pjax"><i class="icon-share"></i></a>
+</div>
     <table class="custom-info">
 <?php foreach ($user->getDynamicData() as $entry) {
 ?>
@@ -61,7 +66,11 @@ if ($info['error']) {
 </div>
 
 <div class="tab_content" id="organization-tab" style="display:none">
-    <table class="custom-info">
+<div class="floating-options">
+    <a href="orgs.php?id=<?php echo $org->getId(); ?>" title="manage"
+        class="action no-pjax"><i class="icon-share"></i></a>
+</div>
+    <table class="custom-info" width="100%">
 <?php foreach ($org->getDynamicData() as $entry) {
 ?>
     <tr><th colspan="2"><strong><?php
@@ -89,9 +98,6 @@ foreach ($notes as $note)
 </div>
 </div>
 
-    <div class="clear"></div>
-    <hr>
-    <div class="faded">Last updated <b><?php echo Format::db_datetime($user->getUpdateDate()); ?> </b></div>
 </div>
 <div id="user-form" style="display:<?php echo $forms ? 'block' : 'none'; ?>;">
 <div><p id="msg_info"><i class="icon-info-sign"></i>&nbsp; Please note that updates will be reflected system-wide.</p></div>
diff --git a/include/staff/ticket-view.inc.php b/include/staff/ticket-view.inc.php
index 1849851cc487617910108c8de1ee6f88d1dbe2d9..6c85c296f48cd02e251811a3325848b291e8c548 100644
--- a/include/staff/ticket-view.inc.php
+++ b/include/staff/ticket-view.inc.php
@@ -185,7 +185,10 @@ if($ticket->isOverdue())
                                                 $user->getId(), $closed);
                                     ?>
                                     <li><a href="tickets.php?a=search&uid=<?php echo $ticket->getOwnerId(); ?>"><i class="icon-double-angle-right icon-fixed-width"></i> All Tickets</a></li>
-                                    <li><a href="users.php?id=<?php echo $user->getId(); ?>"><i class="icon-user icon-fixed-width"></i> Manage Client</a></li>
+                                    <li><a href="users.php?id=<?php echo $user->getId(); ?>" class="no-pjax"><i class="icon-user icon-fixed-width"></i> Manage Client</a></li>
+<?php if ($user->getOrgId()) { ?>
+                                    <li><a href="orgs.php?id=<?php echo $user->getOrgId(); ?>" class="no-pjax"><i class="icon-building icon-fixed-width"></i> Manage Organization</a></li>
+<?php } ?>
                                 </u>
                             </div>
                     <?php
diff --git a/scp/css/scp.css b/scp/css/scp.css
index 53741572a0cff45c48c33f7c34c4f49bf8da0be3..b34aacd8187444bae8ed6aabd4d009b2838123a5 100644
--- a/scp/css/scp.css
+++ b/scp/css/scp.css
@@ -1674,12 +1674,14 @@ tr.disabled th {
 .quicknote .body {
     padding: 10px;
 }
-.quicknote a.action {
+.quicknote a.action,
+.floating-options a.action {
     padding: 2px 4px;
     margin: 1px;
     color: black !important;
 }
-.quicknote a.action:hover {
+.quicknote a.action:hover,
+.floating-options a.action:hover {
     text-decoration: none;
     border: 1px solid #ff9100;
     border-radius: 3px;
@@ -1708,6 +1710,17 @@ tr.disabled th {
   background-color: #3a87ad;
 }
 
+.tab_content {
+    position: relative;
+}
+.floating-options {
+    display: inline-block;
+    position: absolute;
+    right: 0;
+    top: 10px;
+    padding-right: 5px;
+}
+
 table.custom-info th {
     background: transparent;
     border: none;