diff --git a/lib/galaxy/interfaces/root.py b/lib/galaxy/interfaces/root.py
index ee134d4fdf9..01937f5ce0f 100644
--- a/lib/galaxy/interfaces/root.py
+++ b/lib/galaxy/interfaces/root.py
@@ -31,7 +31,7 @@ class Universe(common.Root):
         #         trans.ensure_valid_galaxy_session()
         #         result = trans.fill_template('index_frames.tmpl', mode=mode)
         #         return [ result ]
-        if trans.app.config.get( "new_style_june_2007", "false" ) == "true":
+        if trans.app.config.get( "use_new_layout", "false" ) == "true":
             return trans.fill_template( "root/index.tmpl" )
         else:
             return trans.fill_template( "index_frames.tmpl" )
diff --git a/static/june_2007_style/base.css.tmpl b/static/june_2007_style/base.css.tmpl
index 469e3d700df..eb0aaa25ee3 100644
--- a/static/june_2007_style/base.css.tmpl
+++ b/static/june_2007_style/base.css.tmpl
@@ -48,12 +48,12 @@ div.toolFormTitle
 
 div.toolParamHelp
 {
-  font-style: italic;
+  color: #666;
 }
 
 div.toolFormBody
 { 
-  padding: 5px;
+  padding: 10px;
   background: $form_body_bg_bottom;
   background-image: url(form_body_bg.png);
   background-repeat: repeat-x;
@@ -79,18 +79,38 @@ div.toolHelpBody
 	overflow: auto;
 }
 
-select
+/* Forms */
+
+div.form-row 
 {
-    max-width: 300px;
+    margin-bottom: 1em;
 }
 
+div.form-row label
+{
+    font-weight: bold;
+    display: block;
+    margin-bottom: .1em;
+}
+
+select, input, textarea
+{
+    font-size: 115%;
+}
+
+select, textarea, input[type="text"], input[type="file"]
+{
+    max-width: 400px;
+}
+
+/* Messages */
+
 .errormessage, .warningmessage, .donemessage, .infomessage, .welcomemessage
 {
     padding: 10px;
     padding-left: 52px;
     min-height: 32px;
-    border-top: 1px solid $error_message_border;
-    border-bottom: 1px solid $error_message_border;
+    border: 1px solid $error_message_border;
     background-color: $error_message_bg;
     background-image: url(error_message_icon.png);
     background-repeat: no-repeat;
@@ -130,8 +150,7 @@ select
     padding: 5px;
     padding-left: 25px;
     min-height: 25px;
-    border-top: 1px solid $error_message_border;
-    border-bottom: 1px solid $error_message_border;
+    border: 1px solid $error_message_border;
     background-color: $error_message_bg;
     background-image: url(error_small.png);
     background-repeat: no-repeat;
@@ -222,45 +241,5 @@ div.odd_row
 }
     
 #footer {
-  position: fixed;
-  background: $footer_bg;
-  width: 100%;
-  left: 0px;
-  bottom: 0px;
-  color: white;
-  z-index:10000;
-  opacity:0.9;
-  filter:alpha(opacity:90);
-}
-
-#footer a {
-    color: white;
-}
-
-.footerheader
-{
-  padding: 5px;
-  text-align:center;
-  background-image: url(footer_title_bg.png);
-  background-position: bottom right;
-}
-
-.footermenu
-{
-  /*border-top: solid white 1px; */
-}
-
-.footermenuitem
-{
-    margin-top: 5px;
-    margin-bottom: 5px;
-    margin-right: 5px;
-    margin-left: 25px;
-    display: list-item;
-    list-style: square outside;
-}
-
-.footermenumessage
-{
-    margin: 5px;
+  display: none;
 }
\ No newline at end of file
diff --git a/static/june_2007_style/blue/base.css b/static/june_2007_style/blue/base.css
index 0f6e46350ae..83832c13944 100644
--- a/static/june_2007_style/blue/base.css
+++ b/static/june_2007_style/blue/base.css
@@ -48,12 +48,12 @@ div.toolFormTitle
 
 div.toolParamHelp
 {
-  font-style: italic;
+  color: #666;
 }
 
 div.toolFormBody
 { 
-  padding: 5px;
+  padding: 10px;
   background: #FFFFFF;
   background-image: url(form_body_bg.png);
   background-repeat: repeat-x;
@@ -79,18 +79,38 @@ div.toolHelpBody
 	overflow: auto;
 }
 
-select
+/* Forms */
+
+div.form-row 
 {
-    max-width: 300px;
+    margin-bottom: 1em;
 }
 
+div.form-row label
+{
+    font-weight: bold;
+    display: block;
+    margin-bottom: .1em;
+}
+
+select, input, textarea
+{
+    font-size: 115%;
+}
+
+select, textarea, input[type="text"], input[type="file"]
+{
+    max-width: 400px;
+}
+
+/* Messages */
+
 .errormessage, .warningmessage, .donemessage, .infomessage, .welcomemessage
 {
     padding: 10px;
     padding-left: 52px;
     min-height: 32px;
-    border-top: 1px solid #AA6666;
-    border-bottom: 1px solid #AA6666;
+    border: 1px solid #AA6666;
     background-color: #FFCCCC;
     background-image: url(error_message_icon.png);
     background-repeat: no-repeat;
@@ -130,8 +150,7 @@ select
     padding: 5px;
     padding-left: 25px;
     min-height: 25px;
-    border-top: 1px solid #AA6666;
-    border-bottom: 1px solid #AA6666;
+    border: 1px solid #AA6666;
     background-color: #FFCCCC;
     background-image: url(error_small.png);
     background-repeat: no-repeat;
@@ -222,45 +241,5 @@ div.odd_row
 }
     
 #footer {
-  position: fixed;
-  background: #023858;
-  width: 100%;
-  left: 0px;
-  bottom: 0px;
-  color: white;
-  z-index:10000;
-  opacity:0.9;
-  filter:alpha(opacity:90);
-}
-
-#footer a {
-    color: white;
-}
-
-.footerheader
-{
-  padding: 5px;
-  text-align:center;
-  background-image: url(footer_title_bg.png);
-  background-position: bottom right;
-}
-
-.footermenu
-{
-  /*border-top: solid white 1px; */
-}
-
-.footermenuitem
-{
-    margin-top: 5px;
-    margin-bottom: 5px;
-    margin-right: 5px;
-    margin-left: 25px;
-    display: list-item;
-    list-style: square outside;
-}
-
-.footermenumessage
-{
-    margin: 5px;
+  display: none;
 }
\ No newline at end of file
diff --git a/static/june_2007_style/blue/base_bg.png b/static/june_2007_style/blue/base_bg.png
index b2ed0293579..19ca36f9ee7 100644
Binary files a/static/june_2007_style/blue/base_bg.png and b/static/june_2007_style/blue/base_bg.png differ
diff --git a/static/june_2007_style/blue/error_bg.png b/static/june_2007_style/blue/error_bg.png
index a68067de696..9e537638d5c 100644
Binary files a/static/june_2007_style/blue/error_bg.png and b/static/june_2007_style/blue/error_bg.png differ
diff --git a/static/june_2007_style/blue/footer_title_bg.png b/static/june_2007_style/blue/footer_title_bg.png
index 2c258128a60..577046d7f39 100644
Binary files a/static/june_2007_style/blue/footer_title_bg.png and b/static/june_2007_style/blue/footer_title_bg.png differ
diff --git a/static/june_2007_style/blue/form_body_bg.png b/static/june_2007_style/blue/form_body_bg.png
index 0cf6caf7fb2..2d594ab7afe 100644
Binary files a/static/june_2007_style/blue/form_body_bg.png and b/static/june_2007_style/blue/form_body_bg.png differ
diff --git a/static/june_2007_style/blue/form_title_bg.png b/static/june_2007_style/blue/form_title_bg.png
index 4a281d5289e..56788e39fe2 100644
Binary files a/static/june_2007_style/blue/form_title_bg.png and b/static/june_2007_style/blue/form_title_bg.png differ
diff --git a/static/june_2007_style/blue/gray_bg.png b/static/june_2007_style/blue/gray_bg.png
index 42247901a1b..2c59cafd6ff 100644
Binary files a/static/june_2007_style/blue/gray_bg.png and b/static/june_2007_style/blue/gray_bg.png differ
diff --git a/static/june_2007_style/blue/history.css b/static/june_2007_style/blue/history.css
index d0cbbb0e35b..3a2243bf20d 100644
--- a/static/june_2007_style/blue/history.css
+++ b/static/june_2007_style/blue/history.css
@@ -5,9 +5,7 @@ body
     background-image: url(menu_bg.png);
     background-repeat: repeat-x;
     background-position: top;
-    margin-top: 5px;
-    margin-right: 0;
-    margin-left: 0;
+    margin: 5px;
     border: 0;
     padding: 0;
 }
@@ -20,7 +18,8 @@ a
 div.historyLinks
 {
     padding: 5px;
-    margin: 5px;
+    margin-top: 5px;
+    margin-bottom: 5px;
     padding-right: 5px;
     padding-left: 5px;
     margin-bottom: 5px;
@@ -28,8 +27,9 @@ div.historyLinks
 
 div.historyItem
 {
-    margin: 5px;
-    margin-right: 0px;
+    margin-right: -5px;
+    margin-top: 5px;
+    margin-bottom: 5px;
     padding: 5px;
     padding-right: 11px;
 
diff --git a/static/june_2007_style/blue/masthead_bg.png b/static/june_2007_style/blue/masthead_bg.png
index e81e2f32c8a..0fa04cf0439 100644
Binary files a/static/june_2007_style/blue/masthead_bg.png and b/static/june_2007_style/blue/masthead_bg.png differ
diff --git a/static/june_2007_style/blue/menu_bg.png b/static/june_2007_style/blue/menu_bg.png
index a181ef9000d..6847a88b260 100644
Binary files a/static/june_2007_style/blue/menu_bg.png and b/static/june_2007_style/blue/menu_bg.png differ
diff --git a/static/june_2007_style/blue/ok_bg.png b/static/june_2007_style/blue/ok_bg.png
index dd0f2731d64..838e2abdd6c 100644
Binary files a/static/june_2007_style/blue/ok_bg.png and b/static/june_2007_style/blue/ok_bg.png differ
diff --git a/static/june_2007_style/blue/panel_header_bg.png b/static/june_2007_style/blue/panel_header_bg.png
index 37ce50151b8..195c9dade86 100644
Binary files a/static/june_2007_style/blue/panel_header_bg.png and b/static/june_2007_style/blue/panel_header_bg.png differ
diff --git a/static/june_2007_style/blue/warn_bg.png b/static/june_2007_style/blue/warn_bg.png
index 4ed6df05a5c..30aa1ea5204 100644
Binary files a/static/june_2007_style/blue/warn_bg.png and b/static/june_2007_style/blue/warn_bg.png differ
diff --git a/static/june_2007_style/history.css.tmpl b/static/june_2007_style/history.css.tmpl
index 901a2fa82ab..30c285b20fb 100644
--- a/static/june_2007_style/history.css.tmpl
+++ b/static/june_2007_style/history.css.tmpl
@@ -5,9 +5,7 @@ body
     background-image: url(menu_bg.png);
     background-repeat: repeat-x;
     background-position: top;
-    margin-top: 5px;
-    margin-right: 0;
-    margin-left: 0;
+    margin: 5px;
     border: 0;
     padding: 0;
 }
@@ -20,7 +18,8 @@ a
 div.historyLinks
 {
     padding: 5px;
-    margin: 5px;
+    margin-top: 5px;
+    margin-bottom: 5px;
     padding-right: 5px;
     padding-left: 5px;
     margin-bottom: 5px;
@@ -28,8 +27,9 @@ div.historyLinks
 
 div.historyItem
 {
-    margin: 5px;
-    margin-right: 0px;
+    margin-right: -5px;
+    margin-top: 5px;
+    margin-bottom: 5px;
     padding: 5px;
     padding-right: 11px;
 
diff --git a/static/june_2007_style/make_style.py b/static/june_2007_style/make_style.py
index c0d6da6571a..a7371b8fb8d 100755
--- a/static/june_2007_style/make_style.py
+++ b/static/june_2007_style/make_style.py
@@ -17,6 +17,7 @@ templates = [ ( "base.css.tmpl", "base.css" ),
               
 images = [ 
            ( "./gradient.py 9 30 $panel_header_bg_top - $panel_header_bg_bottom 0 0 $panel_header_bg_bottom 1 1", "panel_header_bg.png" ),
+           ( "./gradient.py 9 30 $panel_header_bg_bottom - $panel_header_bg_top 0 0 $panel_header_bg_top 1 1", "panel_header_bg_pressed.png" ),
            ( "./gradient.py 9 1000 $menu_bg_top $menu_bg_hatch $menu_bg_over 0 0 $menu_bg_over 1 1", "menu_bg.png" ),
            ( "./gradient.py 9 1000 $base_bg_top - $base_bg_bottom 0 0 $base_bg_bottom 1 1", "base_bg.png" ),
            ( "./gradient.py 9 500 $form_body_bg_top - $form_body_bg_bottom 0 0 $form_body_bg_bottom 1 1", "form_body_bg.png" ),
diff --git a/static/light_hatched_style/blue/base_bg.png b/static/light_hatched_style/blue/base_bg.png
index 697db74ad87..7bc65774ab5 100644
Binary files a/static/light_hatched_style/blue/base_bg.png and b/static/light_hatched_style/blue/base_bg.png differ
diff --git a/static/light_hatched_style/blue/error_bg.png b/static/light_hatched_style/blue/error_bg.png
index 984d1663b14..52d89b5869f 100644
Binary files a/static/light_hatched_style/blue/error_bg.png and b/static/light_hatched_style/blue/error_bg.png differ
diff --git a/static/light_hatched_style/blue/footer_title_bg.png b/static/light_hatched_style/blue/footer_title_bg.png
index 77586eca6f5..0d271f83951 100644
Binary files a/static/light_hatched_style/blue/footer_title_bg.png and b/static/light_hatched_style/blue/footer_title_bg.png differ
diff --git a/static/light_hatched_style/blue/form_title_bg.png b/static/light_hatched_style/blue/form_title_bg.png
index 0fc30d583ad..2a35b6d4af3 100644
Binary files a/static/light_hatched_style/blue/form_title_bg.png and b/static/light_hatched_style/blue/form_title_bg.png differ
diff --git a/static/light_hatched_style/blue/gray_bg.png b/static/light_hatched_style/blue/gray_bg.png
index 6521682ffc4..ed392936449 100644
Binary files a/static/light_hatched_style/blue/gray_bg.png and b/static/light_hatched_style/blue/gray_bg.png differ
diff --git a/static/light_hatched_style/blue/history.css b/static/light_hatched_style/blue/history.css
index b02955dc6bf..2bd8dd51a27 100644
--- a/static/light_hatched_style/blue/history.css
+++ b/static/light_hatched_style/blue/history.css
@@ -17,6 +17,12 @@ a
     color: #base_text;
 }
 
+div.historyLinks
+{
+    padding: 5px;
+    margin: 5px;
+}
+
 div.historyItem
 {
     padding: 5px;
diff --git a/static/light_hatched_style/blue/masthead.css b/static/light_hatched_style/blue/masthead.css
index 5138c5e9df4..635f2ee43ae 100644
--- a/static/light_hatched_style/blue/masthead.css
+++ b/static/light_hatched_style/blue/masthead.css
@@ -11,7 +11,7 @@ body
 
 div.pageTitle
 {
-    font-size: x-large;
+    font-size: 160%;
     font-weight: bold;
 }
 
diff --git a/static/light_hatched_style/blue/masthead_bg.png b/static/light_hatched_style/blue/masthead_bg.png
index efd2845c369..32118cc15d1 100644
Binary files a/static/light_hatched_style/blue/masthead_bg.png and b/static/light_hatched_style/blue/masthead_bg.png differ
diff --git a/static/light_hatched_style/blue/menu_bg.png b/static/light_hatched_style/blue/menu_bg.png
index 9004e8ef858..363031cf958 100644
Binary files a/static/light_hatched_style/blue/menu_bg.png and b/static/light_hatched_style/blue/menu_bg.png differ
diff --git a/static/light_hatched_style/blue/ok_bg.png b/static/light_hatched_style/blue/ok_bg.png
index 43e6ababa7d..42cfd91d9d9 100644
Binary files a/static/light_hatched_style/blue/ok_bg.png and b/static/light_hatched_style/blue/ok_bg.png differ
diff --git a/static/light_hatched_style/blue/tool_menu.css b/static/light_hatched_style/blue/tool_menu.css
index c6f2dc6c7ea..47591adc925 100644
--- a/static/light_hatched_style/blue/tool_menu.css
+++ b/static/light_hatched_style/blue/tool_menu.css
@@ -15,6 +15,14 @@ hr
     margin-top: 0px;
 }
 
+div.toolSectionPad
+{
+    margin: 0;
+    padding: 0;
+    height: 5px;
+    font-size: 0px;
+}
+
 div.toolSectionDetailsInner
 { 
   margin-left: 10px;
diff --git a/static/light_hatched_style/blue/warn_bg.png b/static/light_hatched_style/blue/warn_bg.png
index 03c638d3a7e..f824057a317 100644
Binary files a/static/light_hatched_style/blue/warn_bg.png and b/static/light_hatched_style/blue/warn_bg.png differ
diff --git a/static/light_hatched_style/history.css.tmpl b/static/light_hatched_style/history.css.tmpl
index 97207ce7cf9..f62dad98ec2 100644
--- a/static/light_hatched_style/history.css.tmpl
+++ b/static/light_hatched_style/history.css.tmpl
@@ -17,6 +17,12 @@ a
     color: #base_text;
 }
 
+div.historyLinks
+{
+    padding: 5px;
+    margin: 5px;
+}
+
 div.historyItem
 {
     padding: 5px;
diff --git a/static/light_hatched_style/masthead.css.tmpl b/static/light_hatched_style/masthead.css.tmpl
index 2df3f4f6f45..fdf739ec916 100644
--- a/static/light_hatched_style/masthead.css.tmpl
+++ b/static/light_hatched_style/masthead.css.tmpl
@@ -11,7 +11,7 @@ body
 
 div.pageTitle
 {
-    font-size: x-large;
+    font-size: 160%;
     font-weight: bold;
 }
 
diff --git a/static/light_hatched_style/tool_menu.css.tmpl b/static/light_hatched_style/tool_menu.css.tmpl
index 519653ed0bb..a7e20b744d2 100644
--- a/static/light_hatched_style/tool_menu.css.tmpl
+++ b/static/light_hatched_style/tool_menu.css.tmpl
@@ -15,6 +15,14 @@ hr
     margin-top: 0px;
 }
 
+div.toolSectionPad
+{
+    margin: 0;
+    padding: 0;
+    height: 5px;
+    font-size: 0px;
+}
+
 div.toolSectionDetailsInner
 { 
   margin-left: 10px;
diff --git a/templates/history.tmpl b/templates/history.tmpl
index ac2ef236f90..44ab9e72eea 100644
--- a/templates/history.tmpl
+++ b/templates/history.tmpl
@@ -305,7 +305,7 @@ div#footer {
 
 </body>
 
-#if $app.config.get( "new_style_july_2007", "false" ) == "true"
+#if $app.config.get( "show_panel_footers", "true" ) == "true"
 <div style="height: 20px"></div>
 <div id="footer" >
     <div class="footerheader">
diff --git a/templates/index_frames.tmpl b/templates/index_frames.tmpl
index e6be84f6fc4..280e15a5d69 100644
--- a/templates/index_frames.tmpl
+++ b/templates/index_frames.tmpl
@@ -3,7 +3,7 @@
 <HEAD>
 <TITLE>Galaxy</TITLE>
 </HEAD>
-<FRAMESET rows="40,*" border="0" framespacing="0" frameborder="0">
+<FRAMESET rows="36,*" border="0" framespacing="0" frameborder="0">
     <FRAME name="galaxy_masthead" src="$h.url_for('masthead')" frameborder="0" border="0" framespacing="0">
     <FRAME name="mainframe" src="$h.url_for('static/index_frame_three_col.html')" border="3" framespacing="3" frameborder="1">
 </FRAMESET>
diff --git a/templates/tool_menu.tmpl b/templates/tool_menu.tmpl
index fbd43eeac1e..a229190a2ec 100644
--- a/templates/tool_menu.tmpl
+++ b/templates/tool_menu.tmpl
@@ -104,13 +104,11 @@ div#footer {
 
 </div>
 
-#if $app.config.get( "new_style_july_2007", "false" ) == "true"
 <div style="height: 20px"></div>
 
 <div id="footer">
 <div class="footerheader"><b>Tools</b></div>
 </div>
 </body>
-#end if
 
 </html>
\ No newline at end of file
diff --git a/universe_wsgi.ini.sample b/universe_wsgi.ini.sample
index 77b1d2e4c0c..c39cb3e8e8e 100644
--- a/universe_wsgi.ini.sample
+++ b/universe_wsgi.ini.sample
@@ -88,6 +88,8 @@ use_heartbeat = True
 # Comma separated list of UCSC browsers to use for viewing
 ucsc_display_sites = main,test,archaea
 gbrowse_display_sites = wormbase,flybase
+# Use the new iframe/javascript based layout
+use_new_layout=true
 
 # Static files
 
@@ -103,7 +105,10 @@ document_root = %(here)s/static/favicon.ico
 [app:static_style]
 paste.app_factory = galaxy.web.static:make_static
 cache_seconds = 360
-document_root = %(here)s/static/light_hatched_style/blue
+# The new (June 2007) style
+document_root = %(here)s/static/june_2007_style/blue
+# The old hatched style
+#document_root = %(here)s/static/light_hatched_style/blue
 #document_root = %(here)s/static/light_hatched_style/green
 #document_root = %(here)s/static/old_blue_style