2 files changed, 18 insertions, 20 deletions
diff --git a/themes/xtemplate/xtemplate.css b/themes/xtemplate/xtemplate.css
index 75b7d7b80..08b74b851 100644
--- a/themes/xtemplate/xtemplate.css
+++ b/themes/xtemplate/xtemplate.css
@@ -48,38 +48,36 @@ img {
 .header .menu {
   background-color: #69c;
   padding: 5px 5px 0px 5px;
-
 }
 .menu #logo {
   vertical-align: bottom;
-  float: left;
+  border: 0px;
 }
 .menu #primary {
-  padding: 5px 10px 5px 0px;
-  position: absolute;
-  text-align: right;
   font-size: 1.0em;
-  float: right;
+  padding: 0em 0.8em 0.5em 0;
   color: #9cf;
-  left: 225px;
 }
 .menu #primary a {
   font-weight: bold;
   color: #fff;
 }
 .menu #secondary {
-  padding: 0px 10px 5px 0px;
-  position: absolute;
-  text-align: right;
+  padding: 0 1em 0.5em 0;
   font-size: 0.8em;
-  float: right;
   color: #9cf;
-  left: 225px;
 }
 .menu #secondary a {
   font-weight: bold;
   color: #9cf;
 }
+.menu .search-form {
+  padding: 0 0.5em 0 0.5em;
+  margin: 0 0 0.5em 0;
+}
+.menu .search-form input {
+  border: 1px solid #369;
+}
 #secondary form {
   display: inline;
 }
diff --git a/themes/xtemplate/xtemplate.xtmpl b/themes/xtemplate/xtemplate.xtmpl
index a674804b1..f6dfbfcd6 100644
--- a/themes/xtemplate/xtemplate.xtmpl
+++ b/themes/xtemplate/xtemplate.xtmpl
@@ -17,21 +17,21 @@
 <body{onload_attributes}>
 
 <table border="0" cellpadding="0" cellspacing="0" class="header">
-
   <tr>
-    <td colspan="2" class="menu">
-      <span id="logo"><a href="./"><img src="themes/xtemplate/images/druplicon.gif" alt="" /></a></span>
-      <span id="secondary">{secondary_links}</span><br />
+    <td class="menu" valign="bottom"><a href="./"><img src="themes/xtemplate/images/druplicon.gif" alt="" /></a></td>
+    <td class="menu" align="right" valign="middle">
+      <div id="secondary">{secondary_links}</div>
+      <div id="primary">{primary_links}</div>
       <!-- BEGIN: search_box -->
-      <form action="{search_url}" method="post">
-        <input class="keys" type="text" size="50" value="" name="keys" />
+      <form action="{search_url}" method="post" class="search-form">
+        <input class="keys" type="text" size="15" value="" name="keys" />
         <input type="submit" value="{search_button_text}" />
       </form>
       <!-- END: search_box -->
-      <span id="primary">{primary_links}</span>
     </td>
   </tr>
-
+</table>
+<table border="0" cellpadding="0" cellspacing="0" class="header">
   <tr>
     <td valign="top">
       <!-- BEGIN: message -->