Index: /branches/release-28/mt-static/css/structure.css
===================================================================
--- /branches/release-28/mt-static/css/structure.css (revision 1291)
+++ /branches/release-28/mt-static/css/structure.css (revision 1316)
@@ -133,5 +133,4 @@
 
 .main-screen #header-inner,
-.main-screen #system-msg-inner,
 .main-screen #content-header-inner,
 .main-screen #content-inner,
@@ -657,8 +656,9 @@
 .display-options-link {
     position: absolute;
-    top: 9px;
+    bottom: 0px;
     right: 20px;
     background: transparent url(../images/display-options-link.gif) no-repeat right center;
     padding-right: 18px;
+    margin-bottom: .75em;
 }
 .display-options-link:hover {
@@ -681,5 +681,5 @@
     position: absolute;
     right: 240px;
-    top: 9px;
+    bottom: 0px;
 }
 .edit-entry .object-nav,
@@ -696,14 +696,12 @@
 /* Content Header ---------------------------------------------------------------------------------- */
 
-#content-header,
-#system-msg {
+#content-header {
     background: #E7F0F6;
 }
-.system #content-header,
-.system #system-msg {
+.system #content-header {
     background: #EAF3D8;
 }
 
-#system-msg-inner {
+#content-header-inner {
     padding-top: 18px;
 }
Index: /branches/release-28/mt-static/css/hacks/ie.css
===================================================================
--- /branches/release-28/mt-static/css/hacks/ie.css (revision 1313)
+++ /branches/release-28/mt-static/css/hacks/ie.css (revision 1316)
@@ -92,5 +92,5 @@
    display above all other elements on the screen */
 
-.main-screen #system-msg {
+.main-screen #content-header {
     margin-top: 120px;
 }
@@ -108,6 +108,2 @@
 }
 
-.display-options-link {
-    top: 6px;
-}
-
Index: /branches/release-28/mt-static/mt.js
===================================================================
--- /branches/release-28/mt-static/mt.js (revision 1312)
+++ /branches/release-28/mt-static/mt.js (revision 1316)
@@ -1342,5 +1342,5 @@
         if ( navEl && navConEl ) {
             var d = DOM.getAbsoluteDimensions( navConEl );
-            navEl.style.top = "-" + (d.clientHeight + 5) + "px";
+            navEl.style.top = "-" + (d.clientHeight - 13) + "px";
         }
 
Index: /branches/release-28/tmpl/cms/include/header.tmpl
===================================================================
--- /branches/release-28/tmpl/cms/include/header.tmpl (revision 1212)
+++ /branches/release-28/tmpl/cms/include/header.tmpl (revision 1316)
@@ -201,10 +201,8 @@
 </mt:setvarblock><mt:unless name="agent_ie"><$mt:var name="header_block"$><mt:else><mt:if name="force_header"><$mt:var name="header_block"$></mt:if></mt:unless>
 
-<div id="system-msg"><div id="system-msg-inner" class="inner pkg">
+<div id="content-header"><div id="content-header-inner" class="inner pkg">
 <mt:if name="system_msg">
     <$mt:var name="system_msg"$>
 </mt:if>
-</div></div>
-<div id="content-header"><div id="content-header-inner" class="inner pkg">
 <mt:if name="show_display_options_link">
     <a href="javascript:void(0)" class="display-options-link" mt:command="open-flyout" mt:flyout="display-options-widget"><__trans phrase="Display Options"></a>