diff --git a/themes/atspaces/styles.css b/themes/atspaces/styles.css
index 84e5abf69..b33f06f53 100644
--- a/themes/atspaces/styles.css
+++ b/themes/atspaces/styles.css
@@ -1681,10 +1681,9 @@ width:1.5em;
 
 /* Top navigation tabs / list */
 div#topnavlistcontainer {
-	min-height:2.5em;
+	min-height:2.9em;
 	clear:both;
 	width:100%;
-    padding-bottom:.5em;
 	clear:left;
 	float:left;
     margin-right: -14px !important;
@@ -1692,18 +1691,13 @@ div#topnavlistcontainer {
 }
 
 ul#topnavlist {
-    margin: 0; 
-    padding: 0; 
-    width:100%;
  /*   border-top: 1px solid #D1C82E;
     border-bottom: 1px solid #D1C82E; */
     list-style-type: none; 
     list-style-image: none;
-	padding: 0;
-height:2.1em;
+	padding-top:.6em;
+    height:1.8em;
     border-bottom: 1px solid #f6f4da;
-	margin-right: auto;
-	margin-left: auto;
 	font-family: 'Varela Round', Arial, Helvetica, sans-serif; 
     white-space:nowrap;
  }
@@ -3381,13 +3375,7 @@ div#top-links a:focus{
 	padding-right:.5em;
 }
 
-div#topnavlistcontainer {
-	/*background-image: url('images/pencil_bottom_ds.png'); */
-	height:2em;
-	padding-top:1em;
-	clear:both;
-	float:left;
-}
+
 .ui-switch {
     border-radius: 18px;
     cursor: pointer;
@@ -3400,7 +3388,7 @@ div#topnavlistcontainer {
 .logo{
 width:15em;
 margin-left:0em;
-margin-top:-2.6em;
+margin-top:-2em;
 }
 #gototop img{
 height:1.5em;
@@ -3572,11 +3560,13 @@ table.etabbed-table	{
 .scroll-to-fixed-fixed div#topnavlistcontainer{
     background-color:#F6F4DA !important;
     padding:0;
+    padding-top:.3em;
+
 }
 .scroll-to-fixed-fixed div#topnavlistcontainer > ul{
-margin-top:1em;
     white-space:nowrap;
-    overflow:scroll;
+    padding-bottom:.4em;
+
 } 
 .scroll-to-fixed-fixed div#topnavlistcontainer > ul > li {
     padding-top:1.5em;
@@ -3586,14 +3576,15 @@ margin-top:1em;
 
 .scroll-to-fixed-fixed #subnavlistcontainer{
     background-color: #ffffff;
-    margin-top:.6em !important;
+    margin-top:1.3em !important;
     background-image: linear-gradient(#FFFFFF, #FFFFFF) !important;
-    opacity:.8;
+    opacity:.9;
     border-bottom: 1px solid #DED29E !important;
     border-top: 0 !important;
 }
 .scroll-to-fixed-fixed #subnavlist{
-    margin-top:-3.5em !important;
+    margin-top:-3.3em !important;
+    margin-left:2em;
     padding:.2em !important;
 }
 .scroll-to-fixed-fixed #subnavlist_i{
diff --git a/themes/blumin/styles.css b/themes/blumin/styles.css
index 288fd952a..530c556b1 100644
--- a/themes/blumin/styles.css
+++ b/themes/blumin/styles.css
@@ -1161,6 +1161,7 @@ background-color:#DEE7EC;
 	-moz-border-radius: 0em 0em .5em .5em;
 	height:1.5em;
 	float:right;
+	margin-top:-.22em;
 	margin-right:2em;
 	padding-left:.1em;
 }
@@ -1370,20 +1371,34 @@ div#topnavlistcontainer {
     /* Navigational Plone Tabs(tm), implemented by customizing the a tag - they are surprisingly elegant. The power of CSS runs strong in these :) */
     background: transparent;
     border-collapse: collapse;
-    border-bottom: 1px solid #8CACBB;
-    padding: 0.5em 0em 0em 2em;
+    padding-left: 2em;
     clear:left;
     width:100%;
     margin-left:-2em;
+    height:1.8em;
+	margin-top:-1.8em;
+	padding-top:1.5em;
+	padding-bottom:1.1em;
+	margin-bottom:-1.1em;
+	margin-right: -14px !important;
+    overflow-y:hidden;
+    overflow-x:none;
 }
+/*
+div#topnavlistcontainer {
+	height:1.8em;
+	margin-top:-1.8em;
+	padding-top:1.5em;
+	margin-bottom:-.2em;
+	clear:both;
+	float:left;
+}
+*/
 ul#topnavlist {
 	padding: 0px;
-	margin-bottom: 3px;
-	margin-top: 0px;
-	margin-bottom:0px;
+
 	white-space:nowrap;
-    overflow-y:scroll;
-    height:2em;
+    height:2.2em;
 }
 
 ul#topnavlist li {
@@ -1391,7 +1406,8 @@ ul#topnavlist li {
 	list-style: none;
 	display: inline-block;
 	height:auto;
-	margin-top:.2em;
+	margin-top:.5em;
+
 	clear:both;
 
 }
@@ -1415,7 +1431,7 @@ ul#topnavlist li a {
     color: #436976;
     height: 1.2em;
     margin-right: 0.5em;
-    padding: 0em 2em .3em;
+    padding: 0em 1em .2em;
     text-transform: lowercase;
 }
 
@@ -2657,15 +2673,7 @@ div#top-links a:focus{
 	padding-right:.5em;
 }
 
-div#topnavlistcontainer {
-	/*background-image: url('images/pencil_bottom_ds.png'); */
-	height:1.8em;
-	margin-top:-1.8em;
-	padding-top:1.5em;
-	margin-bottom:-.2em;
-	clear:both;
-	float:left;
-}
+
 .ui-switch {
     border-radius: 18px;
     cursor: pointer;
@@ -2678,7 +2686,7 @@ div#topnavlistcontainer {
 .logo{
 width:15em;
 margin-left:0em;
-margin-top:-4.2em;
+margin-top:-2.2em;
 }
 
 /** forum stuff **/
@@ -2815,21 +2823,23 @@ table.etabbed-table	{
     background-color:#DEE7EC !important;
 }
 .scroll-to-fixed-fixed #subnavlistcontainer{
-    margin-top:.7em;
-	  background-color: #DEE7EC;        
+     margin-top:.1em;
+	  background-color: #DEE7EC !important;        
       background-image: linear-gradient(#DEE7EC, #AFCADB)!important;
 }
 .scroll-to-fixed-fixed div#topnavlistcontainer{
-	  background-color: #DEE7EC !important;        
-      background-image: linear-gradient(#DEE7EC, #AFCADB) !important;
+    margin-top:-2.7em;
+	background-color: #DEE7EC !important;        
+    background-image: linear-gradient(#DEE7EC, #AFCADB) !important;
+    padding-bottom:1em !important;
+    overflow-y:hidden;
 }
 .scroll-to-fixed-fixed div#topnavlistcontainer ul{
     white-space:nowrap;
-    overflow:scroll;
+
 }
 .scroll-to-fixed-fixed div#topnavlistcontainer li a{
 	  background-color: #FFFFFF !important;        
-
 }
 #sm_content{
     display:none;
diff --git a/themes/default/styles.css b/themes/default/styles.css
index d0414251b..79f9a386e 100644
--- a/themes/default/styles.css
+++ b/themes/default/styles.css
@@ -1664,16 +1664,28 @@ span.forum-paginator-active{font-weight:700;text-decoration:underline; height:2e
 
 
 /* Top navigation tabs / list */
-div#topnavlistcontainer {
-	/*background-image: url('images/pencil_bottom_ds.png'); */
+/*div#topnavlistcontainer {
 	height:1.8em;
 	margin-top:-1.8em;
 	padding-top:1em;
 	margin-left:1em;
 	clear:both;
 	float:left;
+	    overflow-y:scroll;
+}
+*/
+div#topnavlistcontainer {
+    height:1.8em;
+	width:100%;
+	margin-top:-2.8em;
+	padding-top:1.8em;
+	margin-bottom:-.5em;
+	padding-bottom:.5em;
+	float:left;
+    margin-right: -14px !important;
+    overflow-x:none;
+    overflow-y: hidden;
 }
-
 ul#topnavlist {
 	padding: 0;
 	padding-bottom: 1em;
@@ -1683,7 +1695,7 @@ ul#topnavlist {
 	margin-top: -.4em;
 	height:1.8em;
 	white-space:nowrap;
-    overflow-y:scroll;
+
  }
 
 ul#topnavlist li {
@@ -2716,7 +2728,7 @@ div.social-wrapper{
 .logo{
 width:15em;
 margin-left:0em;
-margin-top:-2.8em;
+margin-top:-2.2em;
 }
 .content-settings{
 	width: 30%;
@@ -3398,12 +3410,12 @@ div.input-form.remedialContent {
     background-color:#F3F3F3 !important;
 }
 .scroll-to-fixed-fixed #subnavlistcontainer{
-    background-color: #F3F3F3;
-    background-image: linear-gradient(#FAFAFA, #EAEAEA);
+    background-color: #F3F3F3 !important;
+    background-image: linear-gradient(#FAFAFA, #EAEAEA) !important;
 }
 .scroll-to-fixed-fixed div#topnavlistcontainer{
-    background-color: #F3F3F3;
-    background-image: linear-gradient(#FAFAFA, #EAEAEA);
+    background-color: #F3F3F3 !important;
+    background-image: linear-gradient(#FAFAFA, #EAEAEA) !important;
 }
 .scroll-to-fixed-fixed div#topnavlistcontainer ul{
     white-space:nowrap;
diff --git a/themes/default15/forms.css b/themes/default15/forms.css
index 2117eb1ec..35394a47f 100644
--- a/themes/default15/forms.css
+++ b/themes/default15/forms.css
@@ -37,7 +37,6 @@ div.input-form textarea {
 }
 
 div.input-form textarea:focus {
-	border:1px solid blue;
 	background-color: white;
 	padding: 2px;
 }
@@ -50,8 +49,7 @@ div.input-form input[type=text], div.input-form input[type=password] {
 }
 
 div.input-form input:focus {
-	border: 1px solid blue;
-	padding: 2px
+
 }
 
 div.input-form div.buttons {
@@ -68,7 +66,6 @@ div.input-form div.buttons input {
 }
 div.input-form div.buttons input:hover {
 	background-color: #f5f5ff;
-	border: 1px solid blue;
 }
 
 
diff --git a/themes/default15/styles.css b/themes/default15/styles.css
index 9eccaa4da..b828b652a 100644
--- a/themes/default15/styles.css
+++ b/themes/default15/styles.css
@@ -102,28 +102,20 @@ p#toc{
 
 /* button */
 .button input {
-	border: 1px solid #999;
-	background-color: white;
-	padding: 2px;
+
 
 }
 
 .button input:hover {
 	background-color: #f5f5ff;
-	border: 1px solid blue;
 	cursor: pointer;
 }
 
 input.button {
-	border: 1px solid #999;
-	background-color: white;
-	padding: 2px;
-	padding-left: 10px;
-	padding-right: 10px;
+
 }
 input.button:hover {
 	background-color: #f5f5ff;
-	border: 1px solid blue;
 }
 
 /* page breakline */
@@ -426,7 +418,6 @@ div#breadcrumbs {
 	color: black;
 	border-top: solid 1px #A7D2F8;
 	border-bottom: solid 1px #A7D2F8;
-	margin-bottom:1.5em;
 }
 div#breadcrumbs a:link, div#breadcrumbs a:visited, div#member-links a:link, div#member-links a:visited {
 	color: black;
@@ -448,7 +439,6 @@ div#member-links {
 
  h2.page-title { 
 	margin-bottom: 10px;
-	padding-top: 1em;
 	margin-left: 5px;
 	clear: both;
 	width:90%;
@@ -702,6 +692,7 @@ div#error ul, div#feedback ul, div#help ul {
 	list-style: none;
 	margin: 0px;
 	padding-left: 0px;
+	width:90%;
 }
 div#error li + li, div#feedback li + li {
 	margin-top: 5px;
@@ -1083,10 +1074,8 @@ a#guide {
 	border: 1px solid #ccc;
 }
 div#guide_box{
-
 	float:right;
 	width:8em;
-	margin-right:em;
 	margin-top:1.5em;
 	padding-left:.1em;
 	width:auto;
@@ -1250,6 +1239,9 @@ div#topnavlistcontainer {
 	width:100%;
 	padding-bottom:.3em;
 	margin-top:-.5em;
+	margin-right: -14px !important;
+    overflow-x:none;
+    overflow-y: hidden;
 }
 ul#topnavlist {
 	padding: 0px;
@@ -1261,7 +1253,7 @@ ul#topnavlist {
 	width:100%;
 	white-space:nowrap;
 	height:2.0em;
-    overflow-x:scroll;
+    
 }
 
 ul#topnavlist li {
@@ -2819,7 +2811,7 @@ div#top-links a:focus{
 .crumbcontainer{
 	padding:0;
 	width:100%;
-	height:1.5em;
+	height:1em;
 	clear:both;
 	float:left;
 }	 
@@ -3012,7 +3004,7 @@ shortcut_icon{
     background-color:#F3F3F3 !important;
 }
 .scroll-to-fixed-fixed #subnavlistcontainer{
-    background-color: #F3F3F3;
+    background-color: #F3F3F3 !important;
     background-image: linear-gradient(#FAFAFA, #F4F9FE)!important;
 }
 .scroll-to-fixed-fixed #subnavlistcontainer > ul{
@@ -3020,10 +3012,10 @@ shortcut_icon{
 }
 .scroll-to-fixed-fixed #subnavlistcontainer > ul > li{
      margin-top:.2em;
-     border-bottom:3px solid #70A1CA;
+     border-bottom:3px solid #70A1CA !important;
 }
 .scroll-to-fixed-fixed div#topnavlistcontainer{
-    background-color: #F3F3F3;
+    background-color: #F3F3F3 !important;
     background-image: linear-gradient(#FAFAFA, #F4F9FE)!important;
 }
 #sm_content{
diff --git a/themes/default16/styles.css b/themes/default16/styles.css
index 85f18f53a..334e23fe2 100644
--- a/themes/default16/styles.css
+++ b/themes/default16/styles.css
@@ -940,7 +940,7 @@ div.paging li a:hover, div.paging li a.current {
 	background-image: url(images/pencil_top.gif);
 	background-position: right bottom;
 	background-repeat: no-repeat;
-	height : 6.85em;
+	height : 7.85em;
 }
 
 #header a{
@@ -1433,15 +1433,19 @@ span.forum-paginator-active{font-weight:700;text-decoration:underline; height:2e
 #inbox-msg li {border:1px solid #eee; border-bottom: 1px solid #F7F3ED; width: 95%; list-style: none; min-height: 11em;}
 
 div#topnavlistcontainer {
-    background-color: #1D2326;
+background-color:#E6E6E6;
+    background-color: transparent;
 	background-image: url(images/pencil_bottom.gif);
 	background-position:  top right;
 	background-repeat: no-repeat;
 }
 div#topnavlistcontainer {
 	/*background-image: url('images/pencil_bottom_ds.png'); */
-	margin-top:-1.6em;
+	margin-top:-2.8em;
 	padding-top:1em;
+	padding-bottom:1.2em;
+	    overflow-y:scroll;
+    overflow-y:hidden;
 	clear:both;
 	float:left;
 	width:100%;
@@ -1451,8 +1455,7 @@ ul#topnavlist {
 	margin-top: -.5em;
 	margin-left:5px;
 	white-space:nowrap;
-    overflow-y:scroll;
-    overflow-y:hidden;
+
      height: 2.2em;
 }
 
@@ -1730,9 +1733,8 @@ ul.current_list{
 .logoutbar{
       background-color:#E6E6E6; 
       font-size:0.85em; 
-      padding-top: 2px; 
       border-bottom:1px solid #cccccc; 
-      height:4em;
+      height:2.5em;
       text-align:right;
       padding-right:1em;
 }
@@ -2956,7 +2958,6 @@ div.fs_tools{
 }
 #userlinks{
 float:right;
-margin-top:.5em;
 width:25em;
 }
 /* 
@@ -3134,16 +3135,21 @@ ul#subnavlist span#showsubnav{
     background-color:#F3F3F3 !important;
 }
 .scroll-to-fixed-fixed #subnavlistcontainer{
-    background-color: #F3F3F3;
+    background-color: #F3F3F3 !important;
     background-image: linear-gradient(#FAFAFA, #EAEAEA)!important;
 }
 .scroll-to-fixed-fixed div#topnavlistcontainer{
-    background-color: #F3F3F3;
+    background-color: #F3F3F3 !important;
     background-image: linear-gradient(#FAFAFA, #EAEAEA)!important;
+    margin-top:-1.8em !important;
+    padding-bottom:1em !important;
 }
 .scroll-to-fixed-fixed div#topnavlistcontainer ul{
+    background-color: #F3F3F3 !important;
+    width:100%;
     white-space:nowrap;
     overflow:scroll;
+    padding-bottom:1.7em;
 } 
 #sm_content{
     display:none;
@@ -3315,7 +3321,7 @@ clear:left;
 .logo{
 width:15em;
 margin-left:0em;
-margin-top:-4.2em;
+margin-top:-2.2em;
 }
 h3.already_registered{
     width:80%;
diff --git a/themes/default20/styles.css b/themes/default20/styles.css
index d3e243aca..f7eaa62f9 100644
--- a/themes/default20/styles.css
+++ b/themes/default20/styles.css
@@ -1543,22 +1543,35 @@ span.forum-paginator-active{font-weight:700;text-decoration:underline; height:2e
 
 
 /* Top navigation tabs / list */
+/*
 div#topnavlistcontainer {
-	/*background-image: url('images/pencil_bottom_ds.png'); */
-	height:auto;
+	
+	margin-top:-1.8em;
+	padding-bottom:1.2em;
 	margin-left:1em;
 	clear:both;
-	margin-bottom:-.8em;
-	
+	float:left;
+	margin-right: -14px !important;
+    overflow-x:none;
+    overflow-y: scroll;
+}
+*/
+div#topnavlistcontainer {
+	margin-top:-1.8em;
+	margin-left:1em;
+	padding-bottom:1em;
+	clear:both;
+	width:100%;
+	clear:left;
+	float:left;
+    margin-right: -14px !important;
+    overflow-y: hidden;
 }
-
 ul#topnavlist {
 	padding: 0;
 	margin-right: auto;
 	margin-left: auto;
  	white-space:nowrap;
-    overflow-y:scroll;
-    overflow-y:hidden
     margin-bottom:-1em;
     height:2em;
  }
@@ -3245,16 +3258,7 @@ div#top-links a:focus{
 	padding-right:.5em;
 }
 
-div#topnavlistcontainer {
-	/*background-image: url('images/pencil_bottom_ds.png'); */
-	height:auto;
-	width:auto;
-	margin-top:-1.3em;
 
-	margin-left:1em;
-	clear:both;
-	float:left;
-}
 .ui-switch {
     border-radius: 18px;
     cursor: pointer;
@@ -3270,7 +3274,7 @@ div#topnavlistcontainer {
 .logo{
 width:15em;
 margin-left:0em;
-margin-top:-4.2em;
+margin-top:-2.2em;
 }
 
 /** forum stuff **/
@@ -3408,23 +3412,33 @@ table.etabbed-table	{
     background-color:#F3F3F3 !important;
 }
 .scroll-to-fixed-fixed #subnavlistcontainer{
-    background-color: #F3F3F3;
+    background-color: #F3F3F3 !important;
     background-image: linear-gradient(#FAFAFA, #EAEAEA)!important;
     margin-top:.3em;
 }
 .scroll-to-fixed-fixed div#topnavlistcontainer{
-    background-color: #F3F3F3;
+    background-color: #F3F3F3 !important;
     background-image: linear-gradient(#FAFAFA, #EAEAEA)!important;
     height:2.7em;
 
+
 }
 .scroll-to-fixed-fixed div#topnavlistcontainer ul{
+margin-top:.5em;
     white-space:nowrap;
     overflow:scroll;
+    padding-bottom:1.2em;
+} 
+.scroll-to-fixed-fixed div#topnavlistcontainer ul li{
+
+
 } 
+.scroll-to-fixed-fixed div#subnavlistcontainer{
+    margin-top:-.2em;
+}
 .scroll-to-fixed-fixed div#subnavlistcontainer ul{
+    width:100%;
     white-space:nowrap;
-    overflow:scroll;
 	border-bottom: 1px solid #DED29E !important;
 }
 
diff --git a/themes/default21/styles.css b/themes/default21/styles.css
index c0b838771..db1e5ebe2 100644
--- a/themes/default21/styles.css
+++ b/themes/default21/styles.css
@@ -1327,6 +1327,7 @@ div#guide_box{
 	box-shadow: .1em .1em .2em #999999;*/
 		background-color: #F4F0CB;
 	float:right;
+	margin-top:-.3em;
 	margin-right:2em;
 	padding-left:.1em;
 	width:auto;
@@ -1576,17 +1577,24 @@ span.forum-paginator-active{font-weight:700;text-decoration:underline; height:2e
 /* Top navigation tabs / list */
 div#topnavlistcontainer {
 	/*background-image: url('images/pencil_bottom_ds.png'); */
-	height:1.6em;
+	height:1.8em;
 	margin-left:1em;
 	clear:both;
 }
-
+div#topnavlistcontainer {
+	/*background-image: url('images/pencil_bottom_ds.png'); */
+	margin-left:1em;
+	clear:both;
+	float:left;
+	background-color: transparent !important;
+	overflow-y:scroll;
+    overflow-y:hidden;
+}
 ul#topnavlist {
 	padding: 0;
 	margin-right: auto;
 	margin-left: auto;
-    overflow-y:scroll;
-    overflow-y:hidden;
+
     padding-bottom: 0.6em;
     padding-top: 0.2em;
     white-space:nowrap;
@@ -3282,13 +3290,7 @@ div#top-links a:focus{
 	padding-right:.5em;
 }
 
-div#topnavlistcontainer {
-	/*background-image: url('images/pencil_bottom_ds.png'); */
-	margin-left:1em;
-	clear:both;
-	float:left;
-	background-color: transparent !important;
-}
+
 .ui-switch {
     border-radius: 18px;
     cursor: pointer;
@@ -3301,7 +3303,7 @@ div#topnavlistcontainer {
 .logo{
 width:15em;
 margin-left:0em;
-margin-top:-4.2em;
+
 }
 .imggoback{
 height:1.5em;
@@ -3388,6 +3390,8 @@ table.etabbed-table	{
     background-color:#B7C68B !important;
 }
 .scroll-to-fixed-fixed div#topnavlistcontainer{
+margin-top:-1em;
+padding-bottom:1.5em;
     background-color:#B7C68B !important;
     white-space:nowrap;
 }
@@ -3402,6 +3406,7 @@ table.etabbed-table	{
 } 
  
 .scroll-to-fixed-fixed #subnavlistcontainer{
+    margin-top:-.75em;
     background-color:#B7C68B !important;
 }
 #sm_content{
diff --git a/themes/default_classic/styles.css b/themes/default_classic/styles.css
index 27209133d..bb8bcef76 100644
--- a/themes/default_classic/styles.css
+++ b/themes/default_classic/styles.css
@@ -1211,6 +1211,7 @@ background-color:#788CB3;
 	-moz-border-radius: 0em 0em .5em .5em;
 	height:1.8em;
 	float:right;
+	margin-top:1.6em;
 	margin-right:2em;
 	padding-left:.1em;
 }
@@ -2729,7 +2730,7 @@ div#topnavlistcontainer {
 .logo{
 width:15em;
 margin-left:0em;
-margin-top:-4.2em;
+margin-top:-2em;
 }
 /* floating layout */
 #contentwrapper{
@@ -2920,7 +2921,7 @@ width:1.5em;
 }
 .scroll-to-fixed-fixed div#topnavlistcontainer ul{
     white-space:nowrap;
-    overflow:scroll;
+    overflow-y:hidden;
 } 
  
 #sm_content{
diff --git a/themes/greenmin/styles.css b/themes/greenmin/styles.css
index cb8c224bc..f9144f620 100644
--- a/themes/greenmin/styles.css
+++ b/themes/greenmin/styles.css
@@ -1161,6 +1161,7 @@ background-color:#DEECE2;
 	-moz-border-radius: 0em 0em .5em .5em;
 	height:1.5em;
 	float:right;
+	margin-top:-.2em;
 	margin-right:2em;
 	padding-left:.1em;
 }
@@ -1374,13 +1375,16 @@ div#topnavlistcontainer {
     clear:left;
     width:100%;
     margin-left:-1em;
+	margin-right: -14px !important;
+    overflow-y:hidden;
+    overflow-x:none;
 }
+
 ul#topnavlist {
 	padding: 0px;
     width:100%;
 	white-space:nowrap;
-    overflow-y:scroll;
-    height:2.1em;
+    height:1.6em;
 
 }
 
@@ -2651,15 +2655,7 @@ div#top-links a:focus{
 	padding-right:.5em;
 }
 
-div#topnavlistcontainer {
-	/*background-image: url('images/pencil_bottom_ds.png'); */
-	height:1.8em;
-	margin-top:-1.8em;
-	padding-top:1.5em;
-	margin-bottom:-.2em;
-	clear:both;
-	float:left;
-}
+
 .ui-switch {
     border-radius: 18px;
     cursor: pointer;
@@ -2672,7 +2668,7 @@ div#topnavlistcontainer {
 .logo{
 width:15em;
 margin-left:0em;
-margin-top:-4.2em;
+margin-top:-2em;
 }
 
 /** forum stuff **/
@@ -2809,17 +2805,18 @@ table.etabbed-table	{
     background-color:#DEECE2 !important;
 }
 .scroll-to-fixed-fixed #subnavlistcontainer{
-    margin-top:.7em;
+    margin-top:.1em;
 	background-color: #DEECE2  !important;        
     background-image: linear-gradient(#DEECE2, #80AD66) !important;
 }
 .scroll-to-fixed-fixed div#topnavlistcontainer{
+    margin-top:-1.2em;
+    padding-bottom:2.2em;
 	background-color: #DEECE2 !important;        
     background-image: linear-gradient(#DEECE2, #80AD66) !important;
 }
 .scroll-to-fixed-fixed div#topnavlistcontainer ul{
     white-space:nowrap;
-    overflow:scroll;
 }
 .scroll-to-fixed-fixed div#topnavlistcontainer li a{
 	  background-color: #FFFFFF;        
diff --git a/themes/idi/styles.css b/themes/idi/styles.css
index 6ce43c36d..32be7b25d 100644
--- a/themes/idi/styles.css
+++ b/themes/idi/styles.css
@@ -1237,7 +1237,7 @@ div#guide_box{
 	height:1.5em;
 	float:right;
 	margin-right:2em;
-	margin-top:-1.5em;
+	margin-top:-.26em;
 	padding-left:.1em;
 }
 div#content-text {
@@ -1476,12 +1476,29 @@ div.forum-post-content div.body p { margin-bottom:20px; }
 div#topnavlistcontainer {
     background: transparent;
     border-bottom: 1px solid #8CACBB;
-    padding: 0.5em -2em .2em 2em;
+    padding: 0.5em -2em .3em 2em;
     clear:left;
-	margin-top:.2em;
+	margin-top:1.2em;
 	margin-right:-2em;
-	width:100%;
+	height:1.7em;
+	margin-top:-.7em;
+	margin-right: -14px !important;
+    overflow-y:hidden;
+    overflow-x:none;
+    padding-bottom:.7em;
+}
+
+/*
+div#topnavlistcontainer {
+
+	height:1.7em;
+	margin-top:-1.7em;
+	padding-top:1em;
+	padding-bottom:.3em;
+	clear:both;
+	float:left;
 }
+*/
 ul#topnavlist {
 	padding: 0px;
 	margin-right: auto;
@@ -1490,7 +1507,7 @@ ul#topnavlist {
 	margin-top: 0px;
 	margin-bottom:0px;
 	white-space:nowrap;
-    overflow:scroll;
+
 }
 
 ul#topnavlist li {
@@ -1523,7 +1540,7 @@ ul#topnavlist li a {
     height: 1.2em;
     margin-right: 0.5em
     margin-top:1em;
-    padding: .2em 1.8em .2em 1.8em;
+    padding: .2em 1.8em .6em 1.8em;
     border-radius: .3em .3em 0em 0em;
     -moz-border-radius: .3em .3em 0em 0em;
 }
@@ -2773,15 +2790,6 @@ div#top-links a:focus{
 	padding-right:.5em;
 }
 
-div#topnavlistcontainer {
-	/*background-image: url('images/pencil_bottom_ds.png'); */
-	height:1.7em;
-	margin-top:-1.7em;
-	padding-top:1em;
-	padding-bottom:.3em;
-	clear:both;
-	float:left;
-}
 .ui-switch {
     border-radius: 18px;
     cursor: pointer;
@@ -2935,22 +2943,26 @@ width:1.5em;
     background-color:#F4F8FA !important;
 }
 .scroll-to-fixed-fixed #subnavlistcontainer{
-    background-color: #f4f8fa;
+    width:100%;
+    background-color: #f4f8fa !important;
     background-image: linear-gradient(#f9f9f9, #f4f8fa) !important; 
+    overflow:hidden !important;
 }
 .scroll-to-fixed-fixed div#topnavlistcontainer{
+    margin-top:-1.3em;
+    padding-bottom:1.2em !important;
+    padding-top:.2em;
     background-color: #f4f8fa;
     background-image: linear-gradient(#f9f9f9, #f4f8fa) !important;
     white-space:nowrap;
 }
 .scroll-to-fixed-fixed div#topnavlistcontainer ul{
     white-space:nowrap;
-    overflow:scroll;
 }
 
 .scroll-to-fixed-fixed #subnavlistcontainer ul{
     white-space:nowrap;
-    overflow:scroll;
+    overflow:hidden !important;    
 }
 
 #sm_content{