diff --git a/UI/Common/Toolbars/SOGoAclOwner.toolbar b/UI/Common/Toolbars/SOGoAclOwner.toolbar
index e2d8f839e..6af766a40 100644
--- a/UI/Common/Toolbars/SOGoAclOwner.toolbar
+++ b/UI/Common/Toolbars/SOGoAclOwner.toolbar
@@ -1,10 +1,5 @@
 ( /* the toolbar groups -*-cperl-*- */
   ( { link = "#";
-      isSafe = NO;
-      label = "Save";
-      onclick = "return saveAcls(this);";
-      image = "tb-compose-save-flat-24x24.png"; },
-    { link = "#";
       isSafe = NO;
       label = "Close";
       onclick = "window.close();";
diff --git a/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox b/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox
index 45d90f3b5..f53445b0d 100644
--- a/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox
+++ b/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox
@@ -16,10 +16,10 @@
 	<li><var:string label:value="Modify" /></li>
 	<li id="accessRightsMenuEntry"><var:string label:value="Access Rights..." /></li>
 	<li class="separator"></li>
-	<li><var:string label:value="New Card" /></li>
-	<li><var:string label:value="New List" /></li>
+	<li class="disabled"><var:string label:value="New Card" /></li>
+	<li class="disabled"><var:string label:value="New List" /></li>
 	<li class="separator"></li>
-	<li><var:string label:value="Delete" /></li>
+	<li class="disabled"><var:string label:value="Delete" /></li>
       </ul>
     </div>
 
@@ -28,7 +28,7 @@
 	<li id="modifyContactMenuEntry" onmouseup="return onMenuEditContact(event, this);"><var:string label:value="Modify" /></li>
 	<li class="separator"></li>
 	<li id="writeToContactMenuEntry" onmouseup="return onMenuWriteToContact(event, this);"><var:string label:value="Write" /></li>
-	<li id="imContactMenuEntry"><var:string label:value="Instant Message" /></li>
+	<li class="disabled" id="imContactMenuEntry"><var:string label:value="Instant Message" /></li>
 	<li class="separator"></li>
 	<li id="deleteContactMenuEntry" onmouseup="return onMenuDeleteContact(event, this);"><var:string label:value="Delete" /></li>
       </ul>
diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox
index 80925409b..1e7be00ae 100644
--- a/UI/Templates/MailerUI/UIxMailMainFrame.wox
+++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox
@@ -9,66 +9,66 @@
     popup="isPopup"
     >
     <div class="menu" id="accountIconMenu">
-      <ul id="sourceList">
-        <li><var:string label:value="Subscribe..." /></li>
-        <li><var:string label:value="Get Messages for Account" /></li>
-        <li><var:string label:value="New Folder..." /></li>
+      <ul>
+        <li class="disabled"><var:string label:value="Subscribe..." /></li>
+        <li class="disabled"><var:string label:value="Get Messages for Account" /></li>
+        <li class="disabled"><var:string label:value="New Folder..." /></li>
         <li class="separator"></li>
-        <li><var:string label:value="Search Messages..." /></li>
-        <li><var:string label:value="Properties..." /></li>
+        <li class="disabled"><var:string label:value="Search Messages..." /></li>
+        <li class="disabled"><var:string label:value="Properties..." /></li>
       </ul>
     </div>
 
     <div class="menu" id="inboxIconMenu">
-      <ul id="sourceList">
-        <li><var:string label:value="Open in New Mail Window" /></li>
-        <li><var:string label:value="Copy Folder Location" /></li>
-        <li><var:string label:value="Subscribe..." /></li>
+      <ul>
+        <li class="disabled"><var:string label:value="Open in New Mail Window" /></li>
+        <li class="disabled"><var:string label:value="Copy Folder Location" /></li>
+        <li class="disabled"><var:string label:value="Subscribe..." /></li>
         <li class="separator"></li>
-        <li><var:string label:value="Mark Folder Read..." /></li>
-        <li><var:string label:value="New Folder..." /></li>
+        <li class="disabled"><var:string label:value="Mark Folder Read..." /></li>
+        <li class="disabled"><var:string label:value="New Folder..." /></li>
         <li><var:string label:value="Compact This Folder" /></li>
         <li class="separator"></li>
-        <li><var:string label:value="Search Messages..." /></li>
-        <li><var:string label:value="Properties..." /></li>
+        <li class="disabled"><var:string label:value="Search Messages..." /></li>
+        <li class="disabled"><var:string label:value="Properties..." /></li>
       </ul>
     </div>
       
     <div class="menu" id="trashIconMenu">
-      <ul id="sourceList">
-        <li><var:string label:value="Open in New Mail Window" /></li>
-        <li><var:string label:value="Copy Folder Location" /></li>
-        <li><var:string label:value="Subscribe..." /></li>
+      <ul>
+        <li class="disabled"><var:string label:value="Open in New Mail Window" /></li>
+        <li class="disabled"><var:string label:value="Copy Folder Location" /></li>
+        <li class="disabled"><var:string label:value="Subscribe..." /></li>
         <li class="separator"></li>
-        <li><var:string label:value="Mark Folder Read..." /></li>
-        <li><var:string label:value="New Subfolder..." /></li>
-        <li><var:string label:value="Compact This Folder" /></li>
-        <li><var:string label:value="Empty Trash" /></li>
+        <li class="disabled"><var:string label:value="Mark Folder Read..." /></li>
+        <li class="disabled"><var:string label:value="New Subfolder..." /></li>
+        <li class="disabled"><var:string label:value="Compact This Folder" /></li>
+        <li class="disabled"><var:string label:value="Empty Trash" /></li>
         <li class="separator"></li>
-        <li><var:string label:value="Search Messages..." /></li>
-        <li><var:string label:value="Properties..." /></li>
+        <li class="disabled"><var:string label:value="Search Messages..." /></li>
+        <li class="disabled"><var:string label:value="Properties..." /></li>
       </ul>
     </div>
 
     <div class="menu" id="mailboxIconMenu">
-      <ul id="sourceList">
-        <li><var:string label:value="Open in New Mail Window" /></li>
-        <li><var:string label:value="Copy Folder Location" /></li>
-        <li><var:string label:value="Subscribe..." /></li>
+      <ul>
+        <li class="disabled"><var:string label:value="Open in New Mail Window" /></li>
+        <li class="disabled"><var:string label:value="Copy Folder Location" /></li>
+        <li class="disabled"><var:string label:value="Subscribe..." /></li>
         <li class="separator"></li>
-        <li><var:string label:value="Mark Folder Read..." /></li>
-        <li><var:string label:value="New Subfolder..." /></li>
-        <li><var:string label:value="Rename Folder..." /></li>
-        <li><var:string label:value="Compact This Folder" /></li>
-        <li><var:string label:value="Delete Folder" /></li>
+        <li class="disabled"><var:string label:value="Mark Folder Read..." /></li>
+        <li class="disabled"><var:string label:value="New Subfolder..." /></li>
+        <li class="disabled"><var:string label:value="Rename Folder..." /></li>
+        <li class="disabled"><var:string label:value="Compact This Folder" /></li>
+        <li class="disabled"><var:string label:value="Delete Folder" /></li>
         <li class="separator"></li>
-        <li><var:string label:value="Search Messages..." /></li>
-        <li><var:string label:value="Properties..." /></li>
+        <li class="disabled"><var:string label:value="Search Messages..." /></li>
+	<li class="disabled"><var:string label:value="Properties..." /></li>
       </ul>
     </div>
     
     <div class="menu" id="addressMenu">
-      <ul id="sourceList">
+      <ul>
         <li id="add_to_addressbook"
           onmouseup="newContactFromEmail(this);"><var:string label:value="Add to Address Book..."/></li>
         <li id="compose_mailto"
@@ -79,7 +79,7 @@
     </div>
 
     <div class="menu" id="messageListMenu">
-      <ul id="sourceList">
+      <ul>
         <li
           onmouseup="onMenuOpenMessage(event);"><var:string label:value="Open Message In New Window"/></li>
         <li class="separator"></li>
@@ -89,33 +89,33 @@
           onmouseup="onMenuReplyToAll(event);"><var:string label:value="Reply to All"/></li>
         <li
           onmouseup="onMenuForwardMessage(event);"><var:string label:value="Forward"/></li>
-        <li
+        <li class="disabled"
           onmouseup="onMenuEditMessageAsNew(event);"><var:string label:value="Edit As New..."/></li>
         <li class="separator"></li>
         <li
-          class="submenu"
+          class="disabled submenu"
           mailboxaction="move"
           submenu="mailboxes-menu"
-          onmouseover="dropDownSubmenu(event);"><var:string label:value="Move To"/></li>
+          onmouseoverx="dropDownSubmenu(event);"><var:string label:value="Move To"/></li>
         <li
-          class="submenu"
+          class="disabled submenu"
           mailboxaction="copy"
           submenu="mailboxes-menu"
-          onmouseover="dropDownSubmenu(event);"><var:string label:value="Copy To"/></li>
+          onmouseoverx="dropDownSubmenu(event);"><var:string label:value="Copy To"/></li>
         <li
-          class="submenu"
+          class="disabled submenu"
           submenu="label-menu"
-          onmouseover="dropDownSubmenu(event);"><var:string label:value="Label"/></li>
+          onmouseoverx="dropDownSubmenu(event);"><var:string label:value="Label"/></li>
         <li
-          class="submenu"
+          class="disabled submenu"
           submenu="mark-menu"
-          onmouseover="dropDownSubmenu(event);"><var:string label:value="Mark"/></li>
+          onmouseoverx="dropDownSubmenu(event);"><var:string label:value="Mark"/></li>
         <li class="separator"></li>
-        <li
+        <li class="disabled"
           onmouseup="onMenuSaveMessageAs(event);"><var:string label:value="Save As..."/></li>
-        <li
+        <li class="disabled"
           onmouseup="onMenuPreviewPrintMessage(event);"><var:string label:value="Print Preview"/></li>
-        <li
+        <li class="disabled"
           onmouseup="onMenuPrintMessage(event);"><var:string label:value="Print..."/></li>
         <li
           onmouseup="onMenuDeleteMessage(event);"><var:string label:value="Delete Message"/></li>
@@ -171,7 +171,7 @@
         <li onmouseup="onMenuLabelMessage(event, 'work');"><var:string label:value="Work" /></li>
         <li onmouseup="onMenuLabelMessage(event, 'personal');"><var:string label:value="Personal" /></li>
         <li onmouseup="onMenuLabelMessage(event, 'todo');"><var:string label:value="To Do" /></li>
-        <li onmouseup="onMenuLab-elMessage(event, 'later');"><var:string label:value="Later" /></li>
+        <li onmouseup="onMenuLabelMessage(event, 'later');"><var:string label:value="Later" /></li>
       </ul>
     </div>
 
diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
index bef490407..62d0d9c25 100644
--- a/UI/Templates/SchedulerUI/UIxCalMainView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -51,16 +51,16 @@
 
     <div class="menu" id="calendarsMenu">
       <ul>
-        <li id="newCalendarMenuEntry"><var:string label:value="New Calendar..."/></li>
-        <li id="deleteCalendarMenuEntry"><var:string label:value="Delete Calendar"/></li>
+        <li class="disabled" id="newCalendarMenuEntry"><var:string label:value="New Calendar..."/></li>
+        <li class="disabled" id="deleteCalendarMenuEntry"><var:string label:value="Delete Calendar"/></li>
         <li id="accessRightsMenuEntry"><var:string label:value="Access Rights..." /></li>
         <li class="separator"></li>
-        <li id="exportCalendarMenuEntry"><var:string label:value="Export Calendar..."/></li>
-        <li id="publishCalendarMenuEntry"><var:string label:value="Publish Calendar..."/></li>
+        <li class="disabled" id="exportCalendarMenuEntry"><var:string label:value="Export Calendar..."/></li>
+        <li class="disabled" id="publishCalendarMenuEntry"><var:string label:value="Publish Calendar..."/></li>
         <li class="separator"></li>
-        <li id="publishCalendarMenuEntry"><var:string label:value="Reload Remote Calendars"/></li>
+        <li class="disabled" id="publishCalendarMenuEntry"><var:string label:value="Reload Remote Calendars"/></li>
         <li class="separator"></li>
-        <li id="calendarPropertiesMenuEntry"><var:string label:value="Properties"/></li>
+        <li class="disabled" id="calendarPropertiesMenuEntry"><var:string label:value="Properties"/></li>
       </ul>
     </div>
 
diff --git a/UI/Templates/UIxAclEditor.wox b/UI/Templates/UIxAclEditor.wox
index 842726b06..20d933583 100644
--- a/UI/Templates/UIxAclEditor.wox
+++ b/UI/Templates/UIxAclEditor.wox
@@ -13,23 +13,26 @@
 
   <form id="aclForm" const:href="saveAcls">
     <div class="acls">
-      <input type="hidden" name="action" value="saveAcls"/>
-      <input type="hidden" id="userUIDS" name="userUIDS"
-        var:value="userUIDS"/>
-      <label><var:string label:value="Owner:"/><br/>
-	<span class="value"><strong><var:string value="ownerName"/></strong></span></label><br/>
-
+      <div id="userSelectorHeader">
+	<input type="hidden" name="action" value="saveAcls"/>
+	<input type="hidden" id="userUIDS" name="userUIDS"
+	  var:value="userUIDS"/>
+	<label><var:string label:value="Owner:"/><br/>
+	  <span class="value"><strong><var:string value="ownerName"/></strong></span></label><br/>
+      </div>
       <div class="userSelector" id="userRoles">
-	<span id="userSelectorButtons">
-	  <a href="#"
-	    class="button"><img rsrc:src="add-contact.gif"
-	      label:title="Add..."
-	      /></a>
-	  <a href="#"
-	    class="button"><img rsrc:src="remove-contact.gif"
-	      label:title="Remove"
-	      /></a>
-	</span>
+	<var:if condition="currentUserIsOwner">
+	  <span id="userSelectorButtons">
+	    <a href="#"
+	      class="button"><img rsrc:src="add-contact.gif"
+		label:title="Add..."
+		/></a>
+	    <a href="#"
+	      class="button"><img rsrc:src="remove-contact.gif"
+		label:title="Remove"
+		/></a>
+	  </span>
+	</var:if>
 	<ul id="userList" multiselect="yes">
 	  <var:foreach list="usersForObject" item="currentUser"
 	    ><li var:id="currentUser">
diff --git a/UI/WebServerResources/HTMLElement.js b/UI/WebServerResources/HTMLElement.js
index 9b18e9275..b59666edd 100644
--- a/UI/WebServerResources/HTMLElement.js
+++ b/UI/WebServerResources/HTMLElement.js
@@ -10,15 +10,12 @@ HTMLElement.prototype.childNodesWithTag = function(tagName) {
   var tagName = tagName.toUpperCase();
 
   for (var i = 0; i < this.childNodes.length; i++) {
-//     log("(" + tagName + ") childNodes " + i + " = " + this.childNodes[i]);
     if (typeof(this.childNodes[i]) == "object"
         && this.childNodes[i].tagName
         && this.childNodes[i].tagName.toUpperCase() == tagName)
       matchingNodes.push(this.childNodes[i]);
   }
 
-//   log ("matching: " + matchingNodes.length);
-
   return matchingNodes;
 }
 
@@ -163,14 +160,10 @@ HTMLElement.prototype.onContextMenu = function(event) {
   popup.style.top = menuTop + "px;";
   popup.style.left = menuLeft + "px;";
   popup.style.visibility = "visible;";
-//   setupMenuTarget(popup, event.target);
 
   bodyOnClick = "" + document.body.getAttribute("onclick");
   document.body.setAttribute("onclick", "onBodyClick(event);");
   document.currentPopupMenu = popup;
-
-//   event.cancelBubble = true;
-//   event.returnValue = false;
 }
 
 HTMLElement.prototype.attachMenu = function(menuName) {
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 341d8f5e9..214be585c 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -376,10 +376,16 @@ function onMailboxTreeItemClick(event) {
   event.preventDefault();
 }
 
-function refreshMailbox() {
-  openMailbox(currentMailbox, true);
+function _refreshWindowMailbox() {
+   openMailbox(currentMailbox, true);
+}
 
-  return false;
+function refreshMailbox() {
+   var topWindow = getTopWindow();
+   if (topWindow)
+      topWindow._refreshWindowMailbox();
+   
+   return false;
 }
 
 function openMailbox(mailbox, reload) {
diff --git a/UI/WebServerResources/SOGoDragAndDrop.js b/UI/WebServerResources/SOGoDragAndDrop.js
index be68c9cb2..83adb8d3d 100644
--- a/UI/WebServerResources/SOGoDragAndDrop.js
+++ b/UI/WebServerResources/SOGoDragAndDrop.js
@@ -23,33 +23,18 @@ var SOGODragAndDropSourceInterface = {
     }
   },
   dragGestureMouseUpHandler: function (event) {
-//     log("mouseup");
     document._currentMouseGestureObject._removeGestureHandlers();
   },
   dragGestureMouseMoveHandler: function (event) {
-//     log("source mouse move (target: " + event.target + ")");
     var deltaX = event.clientX - document._dragGestureStartPoint[0];
     var deltaY = event.clientY - document._dragGestureStartPoint[1];
     if (Math.sqrt((deltaX * deltaX) + (deltaY * deltaY)) > 10) {
-//       log("event: " + event);
-//       event.stopPropagation();
-//       event.preventDefault();
       event.returnValue = true;
       event.cancelBubble = true;
       var object = document._currentMouseGestureObject;
       var point = document._dragGestureStartPoint;
       document.DNDManager.startDragging(object, point);
       document._currentMouseGestureObject._removeGestureHandlers();
-//       var mouseup = document.createEvent("MouseEvent");
-//       mouseup.initEvent("mouseup", true, true);
-//       event.target.dispatchEvent(mouseup);
-//       var dragStart = document.createEvent("MouseEvents");
-//       dragStart.initMouseEvent("draggesture-hack", true, true, window,
-//                                event.detail, event.screenX, event.screenY,
-//                                event.clientX, event.clientY, event.ctrlKey,
-//                                event.altKey, event.shiftKey, event.metaKey,
-//                                event.button, null);
-//       this.dispatchEvent(dragStart);
     }
   }
 }
@@ -94,10 +79,8 @@ document.DNDManager = {
     return destination;
   },
   startDragging: function (object, point) {
-//     log("source gesture intercepted (source: " + object + ")");
     var source = document.DNDManager._lookupSource (object);
     if (source) {
-//       log("source known");
       document.DNDManager.currentDndOperation = new document.DNDOperation(source, point);
       window.addEventListener("mouseup",
                               document.DNDManager.destinationDrop, false);
@@ -113,7 +96,6 @@ document.DNDManager = {
     var operation = document.DNDManager.currentDndOperation;
     var destination = document.DNDManager._lookupDestination (event.target);
     if (operation && destination && destination.dndAcceptType) {
-//       log("enter: " + event.target);
       operation.type = null;
       var i = 0;
       while (operation.type == null
@@ -133,21 +115,14 @@ document.DNDManager = {
     var operation = document.DNDManager.currentDndOperation;
     if (operation
         && operation.destination == event.target) {
-//       log("exit: " + event.target);
       if (operation.destination.dndExit)
         event.target.dndExit();
       operation.setDestination(null);
     }
   },
   destinationOver: function (event) {
-//     log("over: " + event.target);
-//     var operation = document.DNDManager.currentDndOperation;
-//     if (operation
-//         && operation.destination == event.target)
-//       log("over: " + event.target);
   },
   destinationDrop: function (event) {
-//     log ("drop...");
     var operation = document.DNDManager.currentDndOperation;
     if (operation) {
       window.removeEventListener("mouseup",
@@ -159,20 +134,14 @@ document.DNDManager = {
       window.removeEventListener("mouseout",
                                  document.DNDManager.destinationExit, false);
       if (operation.destination == event.target) {
-//         log("drag / drop: " + operation.source + " to " + operation.destination);
         if (operation.destination.dndExit) {
-//           log ("destination.dndExit...");
           operation.destination.dndExit();
         }
         if (operation.destination.dndDrop) {
-//           log ("destination.dndDrop...");
           var data = null;
-//           log ("optype: " + operation.type);
           if (operation.source.dndDataForType)
             data = operation.source.dndDataForType(operation.type);
-//           log ("data: " + data);
           var result = operation.destination.dndDrop(data);
-//           log ("result: " + result);
           if (operation.ghost) {
             if (result)
               operation.bustGhost();
@@ -244,6 +213,8 @@ document.DNDOperation.prototype.chaseGhost = function() {
   document.removeEventListener("mousemove", this.moveGhost, false);
   this.ghost.bustStep = 25;
   this.ghost.chaseStep = 25;
+  this.ghost.style.overflow = "hidden;"
+  this.ghost.style.whiteSpace = "nowrap;";
   this.ghost.chaseDeltaX = ((this.ghost.cascadeLeftOffset() - this.startPoint[0])
                            / this.ghost.chaseStep);
   this.ghost.chaseDeltaY = ((this.ghost.cascadeTopOffset() - this.startPoint[1])
@@ -270,6 +241,8 @@ document.DNDOperation.prototype._chaseGhost = function() {
 document.DNDOperation.prototype._fadeGhost = function() {
   if (this.ghost.bustStep) {
     this.ghost.style.MozOpacity = (0.1 * this.ghost.bustStep);
+    this.ghost.style.width = (this.ghost.offsetWidth * .7) + "px;";
+    this.ghost.style.height = (this.ghost.offsetHeight * .7) + "px;";
     this.ghost.bustStep--;
     setTimeout("document._dyingOperation._fadeGhost();", 50);
   }
diff --git a/UI/WebServerResources/SchedulerUI.css b/UI/WebServerResources/SchedulerUI.css
index 273ff4257..f5478271d 100644
--- a/UI/WebServerResources/SchedulerUI.css
+++ b/UI/WebServerResources/SchedulerUI.css
@@ -59,6 +59,8 @@ UL#tasksList, UL#calendarList
   margin: .25em;
   padding: 0px;
   overflow: auto;
+  overflow-x: hidden;
+  overflow-y: auto;
   border-bottom: 1px solid #fff;
   border-right: 1px solid #fff;
   border-top: 2px solid #222;
diff --git a/UI/WebServerResources/UIxAclEditor.css b/UI/WebServerResources/UIxAclEditor.css
index c0e4be900..c2f375a2a 100644
--- a/UI/WebServerResources/UIxAclEditor.css
+++ b/UI/WebServerResources/UIxAclEditor.css
@@ -1,23 +1,39 @@
 /* test */
 
 DIV.acls
-{ padding: 1em; }
+{ position: absolute;
+  top: 4em;
+  left: 0px;
+  right: 0px;
+  bottom: 0px;
+  padding: 0px;
+  border: 0px;
+  margin: 0px; }
 
 DIV.acls LABEL
 { white-space: nowrap;
   width: 100%; }
 
-DIV.acls UL
-{ height: 100%;
-  width: 100%; }
+DIV#userSelectorHeader
+{ margin: 1em; }
 
 DIV#userRoles
-{ height: 8em;
-  padding-bottom: 2em; }
+{ position: absolute;
+  padding: 0px;
+  margin: 0px;
+  left: 1em;
+  top: 5em;
+  right: 1em;
+  bottom: 0px; }
 
 UL#userList
-{ cursor: default;
-  margin: .25em;
+{ position: absolute;
+  top: 1.5em;
+  bottom: 0px;
+  left: 0px;
+  right: 0px;
+  width: 100%;
+  cursor: default;
   padding: 0px;
   white-space: nowrap;
   overflow: auto;
@@ -34,12 +50,3 @@ UL#userList
 UL#userList > LI._selected
 { background: #4b6983 !important;
   color: #fff !important; }
-
-SELECT#userRoleDropDown
-{ visibility: hidden;
-  margin-top: 1em;
-  margin-left: 2em; }
-
-SPAN.legend
-{ margin-left: 1em;
-  font-size: smaller; }
diff --git a/UI/WebServerResources/generic.css b/UI/WebServerResources/generic.css
index 26b9dd42f..1ee7ce91f 100644
--- a/UI/WebServerResources/generic.css
+++ b/UI/WebServerResources/generic.css
@@ -316,6 +316,9 @@ SPAN.toolbarButton:active
   width: auto;
   white-space: nowrap; }
 
+.menu LI.disabled
+{ color: #999; }
+
 .menu LI IMG
 { margin-left: -.8em;
   padding-right: .2em;
@@ -340,6 +343,9 @@ SPAN.toolbarButton:active
 .menu LI.submenu
 { background-image: url('submenu.gif'); }
 
+.menu LI[class~="disabled"].submenu
+{ background-image: url('submenu-disabled.gif') !important; }
+
 .menu LI.submenu:hover, .menu LI.submenu-selected
 { background-image: url('submenu-active.gif') !important; }
 
@@ -529,6 +535,7 @@ A[class~="_disabled"].button:hover,
 A[class~="_disabled"].button:active
 { cursor: default;
   padding: 1px .5em;
+  background-color: #d4d0c8;
   border-top: 2px solid #fff;
   border-left: 2px solid #fff;
   border-bottom: 2px solid #888;
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index 976cad505..8efe056e9 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -956,6 +956,20 @@ function getUsersRightsWindowWidth() {
    return usersRightsWindowWidth;
 }
 
+function getTopWindow() {
+   var topWindow = null;
+   var currentWindow = window;
+   while (!topWindow) {
+      if (currentWindow.document.body.hasClassName("popup")
+	  && currentWindow.opener)
+	 currentWindow = currentWindow.opener;
+      else
+	 topWindow = currentWindow;
+   }
+
+   return topWindow;
+}
+
 function onTabClick(event) {
   var node = event.target;