3 files changed, 18 insertions, 3 deletions
diff --git a/doc/build/static/docs.css b/doc/build/static/docs.css
index 3735221ce..810c51410 100644
--- a/doc/build/static/docs.css
+++ b/doc/build/static/docs.css
@@ -34,6 +34,10 @@ strong a {
     float:right;
 }
 
+#searchform {
+    padding:20px;
+}
+
 #pagecontrol {
     float:right;
 }
@@ -224,7 +228,7 @@ dl.class > dt
     padding: 0px 10px;
 }
 
-dt:target {
+dt:target, span.highlight {
     background-color:#FBE54E;
 }
 
diff --git a/doc/build/templates/layout.mako b/doc/build/templates/layout.mako
index ba2f16f24..62bbc383a 100644
--- a/doc/build/templates/layout.mako
+++ b/doc/build/templates/layout.mako
@@ -44,7 +44,7 @@
         <div id="search">
         Search:
         <form class="search" action="${pathto('search')}" method="get">
-          <input type="text" name="q" size="18" /> <input type="submit" value="${_('Go')}" />
+          <input type="text" name="q" size="18" /> <input type="submit" value="${_('Search')}" />
           <input type="hidden" name="check_keywords" value="yes" />
           <input type="hidden" name="area" value="default" />
         </form>
@@ -89,7 +89,9 @@
         </div>
         
         <div class="document">
-            ${next.body()}
+            <div class="body">
+                ${next.body()}
+            </div>
         </div>
 
         <%def name="footer()">
diff --git a/doc/build/templates/search.mako b/doc/build/templates/search.mako
index 0340f6a3b..dfad4d0e5 100644
--- a/doc/build/templates/search.mako
+++ b/doc/build/templates/search.mako
@@ -5,6 +5,15 @@
 %>
 <%def name="show_title()">${_('Search')}</%def>
 
+<div id="searchform">
+<h3>Enter Search Terms:</h3>
+<form class="search" action="${pathto('search')}" method="get">
+  <input type="text" name="q" size="18" /> <input type="submit" value="${_('Search')}" />
+  <input type="hidden" name="check_keywords" value="yes" />
+  <input type="hidden" name="area" value="default" />
+</form>
+</div>
+
 <div id="search-results"></div>
 
 <%def name="footer()">