Index: trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/common.css
===================================================================
--- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/common.css (revision 1046)
+++ trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/common.css (revision 1048)
@@ -19,12 +19,15 @@
   background-color: #eee;
   color: black;
+  border-top: 1px solid #bbb;
 }
 h2.bwStatusCancelled {
   background-color: #eee;
   color: black;
+  border-top: 1px solid #bbb;
 }
 h2.bwStatusTentative {
   background: #eee url('../../images/tentativeLines.gif') top;
   color: black;
+  border-top: 1px solid #bbb;
 }
 /* Header IDs and classes */
Index: trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl
===================================================================
--- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl (revision 1047)
+++ trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl (revision 1048)
@@ -124,4 +124,5 @@
         <xsl:call-template name="tabs"/>
         <xsl:call-template name="navigation"/>
+        <xsl:call-template name="searchBar"/>
         <xsl:choose>
           <xsl:when test="/bedework/page='event'">
@@ -142,8 +143,8 @@
           </xsl:when>
           <xsl:otherwise>
-            <!-- otherwise, show the eventsCalendar -->
+            <!-- otherwise, show the eventsCalendar
             <xsl:if test="/bedework/periodname!='Year'">
               <xsl:call-template name="searchBar"/>
-            </xsl:if>
+            </xsl:if>-->
             <!-- main eventCalendar content -->
             <xsl:choose>
@@ -466,5 +467,7 @@
             <form name="searchForm" method="post" action="{$search}">
               Search:
-              <input type="text" name="query" size="10"/>
+              <input type="text" name="query" size="15">
+                <xsl:attribute name="value"><xsl:value-of select="/bedework/searchResults/query"/></xsl:attribute>
+              </input>
               <input type="submit" name="submit" value="go"/>
             </form>
@@ -1093,8 +1096,4 @@
   <!--==== SEARCH RESULT ====-->
   <xsl:template name="searchResult">
-    <xsl:variable name="subscriptionId" select="subscription/id"/>
-    <xsl:variable name="calPath" select="calendar/encodedPath"/>
-    <xsl:variable name="guid" select="guid"/>
-    <xsl:variable name="recurrenceId" select="recurrenceId"/>
     <h2 class="bwStatusConfirmed">Search Result</h2>
     <table id="searchTable" cellpadding="0" cellspacing="0">
@@ -1114,4 +1113,8 @@
       </tr>
       <xsl:for-each select="/bedework/searchResults/searchResult">
+        <xsl:variable name="subscriptionId" select="event/subscription/id"/>
+        <xsl:variable name="calPath" select="event/calendar/encodedPath"/>
+        <xsl:variable name="guid" select="event/guid"/>
+        <xsl:variable name="recurrenceId" select="event/recurrenceId"/>
         <tr>
           <td>