Index: zpt/common_template.zpt
===================================================================
--- zpt/common_template.zpt	(revision 505)
+++ zpt/common_template.zpt	(revision 511)
@@ -55,13 +55,13 @@
   <!-- toc ruler with previous/next toc page buttons -->
   <metal:block metal:define-macro="toc_ruler">
-    <form class="autosubmit" tal:attributes="action viewerUrl">
-      <input type="hidden" tal:define="params python:here.getParams('start', None)" tal:repeat="param params"
+    <form class="autosubmit" tal:attributes="action viewerUrl" tal:define="startParam startParam | string:start">
+      <input type="hidden" tal:define="params python:here.getParams(startParam, None)" tal:repeat="param params"
         tal:attributes="name param; value python:params[param]" /> <a tal:condition="batch/prevStart"
-        tal:attributes="href python:here.getLink('start',batch['prevStart'])">&lt;</a> <span tal:condition="not:batch/prevStart">&lt;</span>
-      <select class="autosubmit" name="start">
+        tal:attributes="href python:here.getLink(startParam,batch['prevStart'])">&lt;</a> <span tal:condition="not:batch/prevStart">&lt;</span>
+      <select class="autosubmit" tal:attributes="name startParam">
         <option tal:repeat="grp batch/batches" tal:attributes="selected python:(start==grp['start']); value grp/start"
           tal:content="string:${grp/start} - ${grp/end}" />
       </select> <input type="submit" value="Go" /> <a tal:condition="batch/nextStart"
-        tal:attributes="href python:here.getLink('start',batch['nextStart'])">&gt;</a> <span tal:condition="not:batch/nextStart">&gt;</span>
+        tal:attributes="href python:here.getLink(startParam,batch['nextStart'])">&gt;</a> <span tal:condition="not:batch/nextStart">&gt;</span>
     </form>
   </metal:block>
Index: zpt/search_template.zpt
===================================================================
--- zpt/search_template.zpt	(revision 511)
+++ zpt/search_template.zpt	(revision 511)
@@ -0,0 +1,21 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+</head>
+<body>
+  <!-- block used for main content area -->
+  <div metal:define-macro="results_div"
+    tal:define="start pageinfo/resultStart; resultsize python:docinfo.get('resultSize',0); grpsize pageinfo/resultPageSize;
+                batch python:here.getBatch(start=start,size=grpsize,end=resultsize);">
+    <div class="ruler" tal:define="startParam string:resultStart">
+        <metal:block metal:use-macro="here/template/common_template/macros/toc_ruler"/>
+    </div>
+    <div class="content"
+      tal:content="structure python:here.getResultsPage(mode=queryType,query=query,start=start,size=grpsize,pageinfo=pageinfo,docinfo=docinfo)" />
+  </div>
+<!--  tal:content="structure python:here.getResultsPage(mode=queryType,query=query,pn=1,pageinfo=pageinfo,docinfo=docinfo)" -->
+<!--  structure python:here.getTocPage(mode='text',start=start,pageinfo=pageinfo,docinfo=docinfo) -->
+</body>
+</html>
Index: zpt/viewer_text.zpt
===================================================================
--- zpt/viewer_text.zpt	(revision 510)
+++ zpt/viewer_text.zpt	(revision 511)
@@ -64,9 +64,9 @@
 
       <!-- right-side search results -->
-      <div class="col search" tal:condition="query">
+      <div class="col results" tal:condition="query">
         <!--"BEGIN SEARCH RESULTS"  -->
         <div class="options">
           <h4>Search results</h4>
-          <div tal:content="structure python:here.getResultsPage(mode=queryType,query=query,pn=1,pageinfo=pageinfo,docinfo=docinfo)"/>
+          <div metal:use-macro="here/template/search_template/macros/results_div"/>
         </div>
       </div>
@@ -92,5 +92,5 @@
                     Dictionary
                   </li>
-                  <li tal:condition="query">
+                  <li tal:condition="python:query">
                     <input type="checkbox" class="autosubmit" name="viewLayer"
                       value="search"
@@ -129,4 +129,5 @@
             <input type="text" name="query" tal:attributes="value query"/>
             <input type="submit" value="Search"/>
+            <a tal:attributes="href python:here.getLink('query',None)">Clear</a>
             <ul>
                 <li>
Index: zpt/viewer_xml.zpt
===================================================================
--- zpt/viewer_xml.zpt	(revision 504)
+++ zpt/viewer_xml.zpt	(revision 511)
@@ -36,5 +36,5 @@
     <div class="page-body" tal:condition="python:here.isAccessible(docinfo)">
       <!--table of contents-->
-      <div class="col-left">
+      <div class="col toc">
         <metal:block
           metal:use-macro="python:path('here/template/toc_%s/macros/main'%tocMode)" />
@@ -42,5 +42,5 @@
 
       <!-- text page -->
-      <div class="col-main">
+      <div class="col main">
         <div class="ruler">
           <metal:block metal:use-macro="here/template/common_template/macros/page_ruler" />
@@ -61,5 +61,5 @@
 
       <!-- right-side options -->
-      <div class="col-right">
+      <div class="col buttons">
         <!--"BEGIN TEXT DISPLAY"  -->
         <div class="options">
@@ -69,9 +69,15 @@
               tal:define="params python:here.getParams(params={'viewMode':None})"
               tal:repeat="param params"
-              tal:attributes="name param; value python:params[param]" /> 
-            <input class="autosubmit" type="radio" name="viewMode" value="text"
-              tal:attributes="checked python:viewMode=='text'" /> Text<br /> 
-            <input type="radio" class="autosubmit" name="viewMode" value="text"
-              tal:attributes="checked python:viewMode=='xml'" /> XML<br />
+              tal:attributes="name param; value python:params[param]" />
+            <ul>
+              <li>
+                <input class="autosubmit" type="radio" name="viewMode" value="text"
+                  tal:attributes="checked python:viewMode=='text'" /> Text
+              </li>
+              <li>
+                <input type="radio" class="autosubmit" name="viewMode" value="text"
+                  tal:attributes="checked python:viewMode=='xml'" /> XML
+              </li>
+            </ul>
             <input type="submit" value="Go!" />
           </form>
@@ -82,31 +88,17 @@
         <div class="options">
           <h4>Text size</h4>
-          <div class="fsizer">
-            &nbsp; <a href="javascript:fontSize(12);" class="fs_sml">S</a> <a
-              href="javascript:fontSize(14);" class="fs_med">M</a> <a
-              href="javascript:fontSize(16);" class="fs_lrg">L</a>
-          </div>
+          <ul class="fsizer">
+            <li>
+              <a href="javascript:fontSize(12);" class="fs_sml">S</a>
+            </li>
+            <li>
+              <a href="javascript:fontSize(14);" class="fs_med">M</a>
+            </li>
+            <li>
+              <a href="javascript:fontSize(16);" class="fs_lrg">L</a>
+            </li>
+          </ul>
         </div>
         <!--"END TEXT SIZE"-->
-
-        <!--"BEGIN TEXT NORMALIZATION"-->
-        <div class="options" tal:condition="python:viewMode!='xml'">
-          <h4>Text normalization</h4>
-          <form tal:attributes="action viewerUrl" class="autosubmit"
-            tal:define="norm python:pageinfo.get('characterNormalization','regPlusNorm');">
-            <input type="hidden"
-              tal:define="params python:here.getParams('characterNormalization',None)"
-              tal:repeat="param params"
-              tal:attributes="name param; value python:params[param]" /> <input
-              type="radio" class="autosubmit" name="characterNormalization" value="orig"
-              tal:attributes="checked python:norm=='orig'" /> Original<br /> <input
-              type="radio" class="autosubmit" name="characterNormalization" value="reg"
-              tal:attributes="checked python:norm=='reg'" /> Regularized<br /> <input
-              type="radio" class="autosubmit" name="characterNormalization"
-              value="regPlusNorm" tal:attributes="checked python:norm=='regPlusNorm'" />
-            Normalized<br /> <input type="submit" value="Go!" />
-          </form>
-        </div>
-        <!--"END TEXT NORMALIZATION"-->
 
       </div>
