diff --git a/styles/styles.css b/styles/styles.css
index c7d4a17..06ddf87 100644
--- a/styles/styles.css
+++ b/styles/styles.css
@@ -65,6 +65,16 @@ ul.list-unstyled {
   padding: 0;
 }
 
+ul:not([class]) ul:not([class]) {
+  margin-left: 1rem;
+}
+
+/* fight me */
+ul ul {
+  margin-left: 1rem;
+}
+
+
 ul.list-bulleted {
   list-style: initial;
   padding: revert;
diff --git a/templates/text/qbat/qbat.base.xsl b/templates/text/qbat/qbat.base.xsl
index 30d9707..6076f71 100644
--- a/templates/text/qbat/qbat.base.xsl
+++ b/templates/text/qbat/qbat.base.xsl
@@ -907,6 +907,7 @@
 
   <xsl:template match="qui:ul">
     <ul>
+      <xsl:apply-templates select="@class" mode="copy" />
       <xsl:apply-templates />
     </ul>
   </xsl:template>
diff --git a/templates/text/qui/includes/qui.scopedivs.xsl b/templates/text/qui/includes/qui.scopedivs.xsl
index 25a0781..bfd8423 100644
--- a/templates/text/qui/includes/qui.scopedivs.xsl
+++ b/templates/text/qui/includes/qui.scopedivs.xsl
@@ -1,7 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<xsl:stylesheet version="1.0" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dlxs="http://dlxs.org" xmlns:qbat="http://dlxs.org/quombat" xmlns:exsl="http://exslt.org/common" xmlns:qui="http://dlxs.org/quombat/ui" extension-element-prefixes="exsl" >
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xhtml="http://www.w3.org/1999/xhtml"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dlxs="http://dlxs.org"
+  xmlns:qbat="http://dlxs.org/quombat" xmlns:exsl="http://exslt.org/common"
+  xmlns:qui="http://dlxs.org/quombat/ui" extension-element-prefixes="exsl">
 
-  <xsl:strip-space elements="*"/>
+  <xsl:strip-space elements="*" />
 
   <xsl:template match="*" mode="build-outline-list">
     <xsl:param name="display-layout" select="'outline'" />
@@ -17,46 +20,54 @@
           <qui:label>
             <xsl:apply-templates select="." mode="ScopingPage" />
           </qui:label>
-          <xsl:for-each select="following-sibling::SummaryString[./preceding-sibling::ScopingPage[1] = $scope]">
+          <xsl:for-each
+            select="following-sibling::SummaryString[./preceding-sibling::ScopingPage[1] = $scope]">
             <qui:callout slot="summary" variant="info">
               <xsl:apply-templates select="." />
             </qui:callout>
           </xsl:for-each>
           <qui:ul>
-            <xsl:for-each select="following-sibling::Kwic[./preceding-sibling::ScopingPage[1] = $scope]">
-            <qui:li>
-              <xsl:apply-templates select="." />
-            </qui:li>
+            <xsl:for-each
+              select="following-sibling::Kwic[./preceding-sibling::ScopingPage[1] = $scope]">
+              <qui:li>
+                <xsl:apply-templates select="." />
+              </qui:li>
             </xsl:for-each>
           </qui:ul>
         </qui:block>
       </xsl:for-each>
 
 
-        <xsl:choose>
-          <!-- outline is the default mode for executing this template, when called
+      <xsl:choose>
+        <!-- outline is the default mode for executing this template, when called
                from results.xsl.  However, if called from text.xsl the DisplayType
                variable could be set to breadcrumb.
                -->
-          <xsl:when test="$template-name='header'">
-            <!-- apply templates to DIVns other than current. (Saxon complains about using 'descendant' axis, so: -->
-            <xsl:apply-templates select="*[starts-with(name(),'DIV')][not(name()=name(.))]" mode="ItemDetails"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:choose>
-              <xsl:when test="$display-layout='outline'">
-                <!-- build the next level -->
-                <qui:debug name="{name(.)}"><xsl:value-of select="$display-layout" /></qui:debug>
-                <xsl:apply-templates select="*[starts-with(name(),'DIV')][not(name()=name(.))]" mode="ItemDetails"/>
-              </xsl:when>           
-              <xsl:when test="$display-layout='breadcrumb'">
-                <xsl:apply-templates select="*[starts-with(name(),'DIV')][not(name()=name(.))]" mode="TxtItemDetailsBC"/>
-              </xsl:when>
-            </xsl:choose>
-          </xsl:otherwise>
-        </xsl:choose>
+        <xsl:when test="$template-name='header'">
+          <!-- apply templates to DIVns other than current. (Saxon complains about using
+          'descendant' axis, so: -->
+          <xsl:apply-templates select="*[starts-with(name(),'DIV')][not(name()=name(.))]"
+            mode="ItemDetails" />
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:choose>
+            <xsl:when test="$display-layout='outline'">
+              <!-- build the next level -->
+              <qui:debug name="{name(.)}">
+                <xsl:value-of select="$display-layout" />
+              </qui:debug>
+              <xsl:apply-templates select="*[starts-with(name(),'DIV')][not(name()=name(.))]"
+                mode="ItemDetails" />
+            </xsl:when>
+            <xsl:when test="$display-layout='breadcrumb'">
+              <xsl:apply-templates select="*[starts-with(name(),'DIV')][not(name()=name(.))]"
+                mode="TxtItemDetailsBC" />
+            </xsl:when>
+          </xsl:choose>
+        </xsl:otherwise>
+      </xsl:choose>
     </xsl:if>
-  </xsl:template>  
+  </xsl:template>
 
   <!-- ********************************************************************** -->
   <!-- DIV  mode=ItemDetails  -->
@@ -66,82 +77,85 @@
       <xsl:attribute name="class">resindentlevelx</xsl:attribute>
       <xsl:if test="@ID">
         <xsl:attribute name="id">
-          <xsl:value-of select="@ID"/>
+          <xsl:value-of select="@ID" />
         </xsl:attribute>
       </xsl:if>
       <!-- we can test TYPE attribute and map selected values to an
         html STYLE attribute style definition, as in
         <xsl:attribute name="style">border:1px solid #999999</xsl:attribute>
       -->
-      
-      <xsl:apply-templates select="Divhead"/>
-      <xsl:apply-templates select="Kwic|SummaryString"/>
-      <xsl:apply-templates select="*[starts-with(name(),'DIV')][string-length(name())&lt;=5]" mode="ItemDetails"/>
-      
+
+      <xsl:apply-templates select="Divhead" />
+      <xsl:apply-templates select="Kwic|SummaryString" />
+      <xsl:apply-templates select="*[starts-with(name(),'DIV')][string-length(name())&lt;=5]"
+        mode="ItemDetails" />
+
       <xsl:choose>
         <xsl:when test="DIVINFO">
-          <xsl:apply-templates select="HEAD[1]"/>
+          <xsl:apply-templates select="HEAD[1]" />
           <!--       <xsl:call-template name="printdivinfo"/> -->
-          <xsl:apply-templates select="*[name()!='DIVINFO'][name()!='HEAD']"/>
+          <xsl:apply-templates select="*[name()!='DIVINFO'][name()!='HEAD']" />
         </xsl:when>
       </xsl:choose>
     </xsl:element>
   </xsl:template>
-  
+
   <!-- ********************************************************************** -->
   <!-- DIV2-10  no mode  -->
   <!-- ********************************************************************** -->
   <xsl:template match="DIV2|DIV3|DIV4|DIV5|DIV6|DIV7|DIV8|DIV9|DIV10">
     <xsl:if test="@ID">
       <xsl:element name="a">
-        <xsl:attribute name="name"><xsl:value-of select="@ID"/></xsl:attribute>
+        <xsl:attribute name="name">
+          <xsl:value-of select="@ID" />
+        </xsl:attribute>
       </xsl:element>
     </xsl:if>
     <xsl:element name="div">
       <xsl:attribute name="class">textindentlevelx</xsl:attribute>
       <xsl:if test="@ID">
         <xsl:attribute name="id">
-          <xsl:value-of select="@ID"/>
+          <xsl:value-of select="@ID" />
         </xsl:attribute>
       </xsl:if>
       <!-- we can test TYPE attribute and map selected values to an
         html STYLE attribute style definition, as in
         <xsl:attribute name="style">border:1px solid #999999</xsl:attribute>
       -->
-      <xsl:apply-templates select="*[starts-with(name(),'DIV')][string-length(name())&lt;=5]"/>
-      
+      <xsl:apply-templates select="*[starts-with(name(),'DIV')][string-length(name())&lt;=5]" />
+
       <xsl:choose>
         <xsl:when test="DIVINFO">
           <xsl:for-each select="HEAD">
-            <xsl:apply-templates select="."/>
+            <xsl:apply-templates select="." />
             <xsl:if test="position()!=last()">
               <xsl:text>&#xa0;</xsl:text>
             </xsl:if>
           </xsl:for-each>
-          <xsl:apply-templates select="*[name()!='DIVINFO'][name()!='HEAD']"/>
+          <xsl:apply-templates select="*[name()!='DIVINFO'][name()!='HEAD']" />
         </xsl:when>
         <xsl:otherwise>
-          <xsl:apply-templates/>
+          <xsl:apply-templates />
         </xsl:otherwise>
       </xsl:choose>
     </xsl:element>
   </xsl:template>
-  
-  
+
+
   <xsl:template match="DIV2|DIV3|DIV4|DIV5|DIV6|DIV7|DIV8|DIV9|DIV10" mode="TxtItemDetailsBC">
     <xsl:element name="span">
       <xsl:attribute name="class">inlinediv</xsl:attribute>
       <xsl:choose>
         <xsl:when test="Divhead">
-          <xsl:apply-templates select="Kwic"/>
+          <xsl:apply-templates select="Kwic" />
         </xsl:when>
-        <xsl:otherwise/>
+        <xsl:otherwise />
       </xsl:choose>
-      <xsl:apply-templates select="*[starts-with(name(),'DIV')]" mode="TxtItemDetailsBC"/>
+      <xsl:apply-templates select="*[starts-with(name(),'DIV')]" mode="TxtItemDetailsBC" />
     </xsl:element>
     <xsl:text>&gt;</xsl:text>
   </xsl:template>
-  
+
   <xsl:template match="Divhead">
     <pre>WAH</pre>
     <xsl:variable name="BuildLinks">
@@ -155,13 +169,13 @@
       <xsl:choose>
         <!-- disable div linking for serialarticle: served whole -->
         <xsl:when test="ancestor::Item/DocEncodingType='serialarticle'">
-          <xsl:value-of select="'true'"/>
+          <xsl:value-of select="'true'" />
         </xsl:when>
         <xsl:when test="parent::*[@STATUS='nolink']">
-          <xsl:value-of select="'true'"/>
+          <xsl:value-of select="'true'" />
         </xsl:when>
         <xsl:otherwise>
-          <xsl:value-of select="'false'"/>
+          <xsl:value-of select="'false'" />
         </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
@@ -170,8 +184,8 @@
       <xsl:choose>
         <xsl:when test="ancestor::Item/DocEncodingType='serialissue'">
           <xsl:call-template name="SerIssueItemBrief">
-            <xsl:with-param name="itemBiblNode" select="BIBL"/>
-            <xsl:with-param name="itemLink" select="following-sibling::Link"/>
+            <xsl:with-param name="itemBiblNode" select="BIBL" />
+            <xsl:with-param name="itemLink" select="following-sibling::Link" />
           </xsl:call-template>
         </xsl:when>
         <xsl:otherwise>
@@ -179,27 +193,27 @@
             <xsl:choose>
               <xsl:when test="BIBL and not(/Top/Item/DocEncodingType='serialissue')">
                 <xsl:for-each select="BIBL/*">
-                  <xsl:apply-templates select="."/>
+                  <xsl:apply-templates select="." />
                   <xsl:if test="position()!=last()">
                     <xsl:text>,&#xa0;</xsl:text>
                   </xsl:if>
                 </xsl:for-each>
               </xsl:when>
-              <xsl:otherwise/>
+              <xsl:otherwise />
             </xsl:choose>
           </xsl:variable>
           <xsl:choose>
             <xsl:when test="$BuildLinks='false' or $NonLinkedDiv='true'">
               <!-- labels, not links  -->
-              <xsl:call-template name="BuildDivHeadLinkLabel"/>
+              <xsl:call-template name="BuildDivHeadLinkLabel" />
             </xsl:when>
             <xsl:otherwise>
               <xsl:element name="a">
                 <xsl:attribute name="href">
-                  <xsl:value-of select="following-sibling::Link"/>
+                  <xsl:value-of select="following-sibling::Link" />
                 </xsl:attribute>
                 <!-- handle labels for DIVs without HEADs -->
-                <xsl:call-template name="BuildDivHeadLinkLabel"/>
+                <xsl:call-template name="BuildDivHeadLinkLabel" />
               </xsl:element>
               <!-- append meta info such as page numbers in toc view only-->
               <!-- not desired in results details or textview, or it'll
@@ -208,205 +222,224 @@
                 <xsl:if test="not($BIBLcontent='')">
                   <span class="divmeta">
                     <xsl:text>,&#xa0;</xsl:text>
-                    <xsl:value-of select="$BIBLcontent"/>
+                    <xsl:value-of select="$BIBLcontent" />
                   </span>
                 </xsl:if>
                 <xsl:if test="HEAD/BIBL[@TYPE!='pg' or @TYPE='pp' or @TYPE='page' or @TYPE='para']">
                   <xsl:text>&#xa0;</xsl:text>
                   <span class="divmeta">
-                    <xsl:apply-templates select="HEAD/BIBL[@TYPE='pg' or @TYPE='pp' or @TYPE='page' or @TYPE='para']"/>
+                    <xsl:apply-templates
+                      select="HEAD/BIBL[@TYPE='pg' or @TYPE='pp' or @TYPE='page' or @TYPE='para']" />
                   </span>
                 </xsl:if>
               </xsl:if>
             </xsl:otherwise>
           </xsl:choose>
           <xsl:if test="descendant::NOTE1 and $dlxsTemp='text'">
-            <xsl:apply-templates select="descendant::NOTE1"/>
+            <xsl:apply-templates select="descendant::NOTE1" />
           </xsl:if>
         </xsl:otherwise>
       </xsl:choose>
     </xsl:element>
   </xsl:template>
-  
+
   <!-- template for building results or toc section and page links -->
   <xsl:template name="BuildLink">
-    <xsl:param name="content"/>
-    <xsl:param name="href"/>
+    <xsl:param name="content" />
+    <xsl:param name="href" />
     <a href="{$href}">
-      <xsl:value-of select="$content"/>
+      <xsl:value-of select="$content" />
     </a>
   </xsl:template>
-  
+
   <xsl:template match="HEAD" mode="procdivhead">
     <xsl:if test="BIBL">
       <xsl:for-each select="BIBL[@TYPE!='pg' and @TYPE!='pp' and @TYPE!='page' and @TYPE!='para']">
-        <xsl:apply-templates select="LB|HI1|HI2|Highlight|text()"/>
+        <xsl:apply-templates select="LB|HI1|HI2|Highlight|text()" />
         <xsl:if test="position()!=last()">
           <xsl:text>:&#xa0;</xsl:text>
         </xsl:if>
       </xsl:for-each>
     </xsl:if>
-    <xsl:apply-templates select="LB|HI1|HI2|Highlight|text()[not(starts-with(normalize-space(.),' '))]"/>
+    <xsl:apply-templates
+      select="LB|HI1|HI2|Highlight|text()[not(starts-with(normalize-space(.),' '))]" />
   </xsl:template>
-  
-  
+
+
   <xsl:template match="BIBL[ancestor::Divhead]">
     <xsl:choose>
       <xsl:when test="@TYPE='para'">
         <xsl:text>[para.&#xa0;</xsl:text>
-        <xsl:value-of select="concat(.,']&#xa0;')"/>
+        <xsl:value-of select="concat(.,']&#xa0;')" />
       </xsl:when>
       <xsl:when test="@TYPE='title'">
-        <xsl:value-of select="."/>
+        <xsl:value-of select="." />
       </xsl:when>
       <xsl:when test="@TYPE='chapter'">
-        <xsl:value-of select="concat(., ':&#xa0;')"/>
+        <xsl:value-of select="concat(., ':&#xa0;')" />
       </xsl:when>
-      <xsl:otherwise> [<xsl:value-of select="."/>] </xsl:otherwise>
+      <xsl:otherwise> [<xsl:value-of select="." />] </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-  
-  
+
+
   <!-- Template for handling ScopingPages -->
   <xsl:template match="ScopingPage" mode="ScopingPage">
     <xsl:choose>
       <xsl:when test="$BuildLinks='true'">
         <xsl:call-template name="BuildLink">
-          <xsl:with-param name="href" select="ViewPageLink"/>
+          <xsl:with-param name="href" select="ViewPageLink" />
           <xsl:with-param name="content">
-            <xsl:value-of select="key('get-lookup','headerutils.str.page')"/>
+            <xsl:value-of select="key('get-lookup','headerutils.str.page')" />
             <xsl:text>&#xa0;</xsl:text>
-<xsl:if test="PageNumber!='NA'"><xsl:value-of select="PageNumber"/></xsl:if>
-<xsl:if test="PageNumber='NA'"><xsl:text>[unnumbered]</xsl:text></xsl:if>
-            <xsl:if test="PageType!='viewer.ftr.uns'"><xsl:text>&#xa0;-&#xa0;</xsl:text></xsl:if>
-            <xsl:value-of select="key('get-lookup',PageType)"/>
+            <xsl:if test="PageNumber!='NA'">
+              <xsl:value-of select="PageNumber" />
+            </xsl:if>
+            <xsl:if test="PageNumber='NA'">
+              <xsl:text>[unnumbered]</xsl:text>
+            </xsl:if>
+            <xsl:if test="PageType!='viewer.ftr.uns'">
+              <xsl:text>&#xa0;-&#xa0;</xsl:text>
+            </xsl:if>
+            <xsl:value-of select="key('get-lookup',PageType)" />
           </xsl:with-param>
         </xsl:call-template>
       </xsl:when>
       <xsl:otherwise>
-        <xsl:value-of select="key('get-lookup','headerutils.str.page')"/>
+        <xsl:value-of select="key('get-lookup','headerutils.str.page')" />
         <xsl:text>&#xa0;</xsl:text>
-  <xsl:if test="PageNumber!='NA'"><xsl:value-of select="PageNumber"/></xsl:if>
-  <xsl:if test="PageNumber='NA'"><xsl:text>[unnumbered]</xsl:text></xsl:if>
-        <xsl:if test="PageType!='viewer.ftr.uns'"><xsl:text>&#xa0;-&#xa0;</xsl:text></xsl:if>
-        <xsl:value-of select="key('get-lookup',PageType)"/>
+        <xsl:if test="PageNumber!='NA'">
+          <xsl:value-of select="PageNumber" />
+        </xsl:if>
+        <xsl:if test="PageNumber='NA'">
+          <xsl:text>[unnumbered]</xsl:text>
+        </xsl:if>
+        <xsl:if test="PageType!='viewer.ftr.uns'">
+          <xsl:text>&#xa0;-&#xa0;</xsl:text>
+        </xsl:if>
+        <xsl:value-of select="key('get-lookup',PageType)" />
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-  
-  
+
+
   <!-- template for handling summary strings in summary mode -->
   <xsl:template match="SummaryString">
-    <xsl:value-of select="HitCount"/>
-    <xsl:value-of select="key('get-lookup','results.str.14')"/>
-    <xsl:apply-templates mode="HitSummPl" select="HitCount"/>
-    <xsl:value-of select="key('get-lookup','results.str.15')"/>
-    <xsl:for-each select="HitTerm"><xsl:text>&quot;</xsl:text><xsl:value-of select="."/><xsl:text>&quot; </xsl:text></xsl:for-each>
+    <xsl:value-of select="HitCount" />
+    <xsl:value-of select="key('get-lookup','results.str.14')" />
+    <xsl:apply-templates mode="HitSummPl" select="HitCount" />
+    <xsl:value-of select="key('get-lookup','results.str.15')" />
+    <xsl:for-each select="HitTerm">
+      <xsl:text>&quot;</xsl:text>
+      <xsl:value-of select="." />
+      <xsl:text>&quot; </xsl:text>
+    </xsl:for-each>
   </xsl:template>
-  
-  
+
+
   <!-- Template for handling Kwics in any mode -->
   <xsl:template match="Kwic">
     <xsl:text>...</xsl:text>
-    <xsl:apply-templates mode="KwicContent" select="child::node()"/>
+    <xsl:apply-templates mode="KwicContent" select="child::node()" />
     <xsl:text> ...</xsl:text>
   </xsl:template>
-  
+
   <!-- Template for handling content inside kwic tags -->
   <xsl:template match="*" mode="KwicContent">
     <xsl:choose>
       <xsl:when test="name()='Highlight'">
-        <xsl:apply-templates select="."/>
+        <xsl:apply-templates select="." />
       </xsl:when>
-      <xsl:otherwise>        
-        <xsl:apply-templates  select="child::node()" mode="KwicContent"/>
+      <xsl:otherwise>
+        <xsl:apply-templates select="child::node()" mode="KwicContent" />
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
   <!-- Special formatting for elements inside kwic tags -->
   <xsl:template match="HEAD" mode="KwicContent">
-    <xsl:apply-templates select="child::node()" mode="KwicContent"/>
+    <xsl:apply-templates select="child::node()" mode="KwicContent" />
     <xsl:text>: </xsl:text>
   </xsl:template>
   <xsl:template match="NOTE1|NOTE2" mode="KwicContent">
     <xsl:text>[</xsl:text>
-    <xsl:apply-templates select="child::node()" mode="KwicContent"/>
+    <xsl:apply-templates select="child::node()" mode="KwicContent" />
     <xsl:text>]</xsl:text>
   </xsl:template>
   <xsl:template match="LB" mode="KwicContent">
     <xsl:text> </xsl:text>
   </xsl:template>
   <xsl:template match="L" mode="KwicContent">
-    <xsl:apply-templates select="child::node()" mode="KwicContent"/>
+    <xsl:apply-templates select="child::node()" mode="KwicContent" />
     <xsl:text> / </xsl:text>
   </xsl:template>
   <xsl:template match="P" mode="KwicContent">
     <xsl:text> </xsl:text>
-    <xsl:apply-templates select="child::node()" mode="KwicContent"/>
+    <xsl:apply-templates select="child::node()" mode="KwicContent" />
     <xsl:text> / </xsl:text>
   </xsl:template>
   <xsl:template match="DATE|CLOSER" mode="KwicContent">
     <xsl:text> </xsl:text>
-    <xsl:apply-templates select="child::node()" mode="KwicContent"/>
+    <xsl:apply-templates select="child::node()" mode="KwicContent" />
     <xsl:text> </xsl:text>
   </xsl:template>
 
-<!-- SerIssueItemBrief: for TOC div/article display.  Could be
+  <!-- SerIssueItemBrief: for TOC div/article display.  Could be
   enhanced to handle divs that are not article content such as title
   page etc. -->
   <xsl:template name="SerIssueItemBrief">
-    <xsl:param name="itemBiblNode"/>
-    <xsl:param name="itemLink"/>
+    <xsl:param name="itemBiblNode" />
+    <xsl:param name="itemLink" />
     <xsl:variable name="authRequired">
-      <xsl:value-of select="/Top/AuthRequired"/>
+      <xsl:value-of select="/Top/AuthRequired" />
     </xsl:variable>
 
-        <xsl:if test="$itemBiblNode/TITLE">
-          <xsl:choose>
-            <xsl:when test="$itemLink!=''">
-            <!-- <xsl:when test="$itemLink!='null'"> -->
-              <a href="{$itemLink}" class="articletitle">
-                <xsl:apply-templates select="$itemBiblNode/TITLE[not(@TYPE='sort')]" mode="hdrtitle"/>
-              </a>
-            </xsl:when>
-            <xsl:otherwise>
-              <span class="articletitle">
-                <xsl:apply-templates select="$itemBiblNode/TITLE[not(@TYPE='sort')]" mode="hdrtitle"/>
-              </span>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:if>
-        <xsl:choose>
-          <xsl:when test="$itemBiblNode/AUTHOR">
-            <div class="articleauthor">
-              <xsl:apply-templates select="$itemBiblNode/AUTHOR" mode="hdrauthor"/>
-              <xsl:if test="$itemBiblNode/BIBLSCOPE[(@TYPE='pg' or @TYPE='pageno')]">
-                <xsl:text>,&#xa0;</xsl:text>
-                <xsl:apply-templates select="$itemBiblNode/BIBLSCOPE[(@TYPE='pg' or @TYPE='pageno')]"/>
-              </xsl:if>
-            </div>
-          </xsl:when>
-          <xsl:when test="$itemBiblNode/AUTHORIND">
-            <div class="articleauthor">
-              <xsl:for-each select="$itemBiblNode/AUTHORIND">
-                <xsl:apply-templates select="."/>
-                <xsl:if test="position()!=last()">
-                  <xsl:text>;&#xa0;</xsl:text>
-                </xsl:if>
-              </xsl:for-each>
-              <xsl:if test="$itemBiblNode/BIBLSCOPE[(@TYPE='pg' or @TYPE='pageno')]">
-                <xsl:text>;&#xa0;</xsl:text>
-                <xsl:apply-templates select="$itemBiblNode/BIBLSCOPE[(@TYPE='pg' or @TYPE='pageno')]"/>
-              </xsl:if>
-            </div>
-          </xsl:when><xsl:otherwise>
-            <div class="articleauthor">
-              <xsl:if test="$itemBiblNode/BIBLSCOPE[(@TYPE='pg' or @TYPE='pageno')]">
-                <xsl:apply-templates select="$itemBiblNode/BIBLSCOPE[(@TYPE='pg' or @TYPE='pageno')]"/>
-              </xsl:if>
-            </div>
-          </xsl:otherwise>
+    <xsl:if test="$itemBiblNode/TITLE">
+      <xsl:choose>
+        <xsl:when test="$itemLink!=''">
+          <!-- <xsl:when test="$itemLink!='null'"> -->
+          <a href="{$itemLink}" class="articletitle">
+            <xsl:apply-templates select="$itemBiblNode/TITLE[not(@TYPE='sort')]" mode="hdrtitle" />
+          </a>
+        </xsl:when>
+        <xsl:otherwise>
+          <span class="articletitle">
+            <xsl:apply-templates select="$itemBiblNode/TITLE[not(@TYPE='sort')]" mode="hdrtitle" />
+          </span>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:if>
+    <xsl:choose>
+      <xsl:when test="$itemBiblNode/AUTHOR">
+        <div class="articleauthor">
+          <xsl:apply-templates select="$itemBiblNode/AUTHOR" mode="hdrauthor" />
+          <xsl:if test="$itemBiblNode/BIBLSCOPE[(@TYPE='pg' or @TYPE='pageno')]">
+            <xsl:text>,&#xa0;</xsl:text>
+            <xsl:apply-templates select="$itemBiblNode/BIBLSCOPE[(@TYPE='pg' or @TYPE='pageno')]" />
+          </xsl:if>
+        </div>
+      </xsl:when>
+      <xsl:when test="$itemBiblNode/AUTHORIND">
+        <div class="articleauthor">
+          <xsl:for-each select="$itemBiblNode/AUTHORIND">
+            <xsl:apply-templates select="." />
+            <xsl:if test="position()!=last()">
+              <xsl:text>;&#xa0;</xsl:text>
+            </xsl:if>
+          </xsl:for-each>
+          <xsl:if test="$itemBiblNode/BIBLSCOPE[(@TYPE='pg' or @TYPE='pageno')]">
+            <xsl:text>;&#xa0;</xsl:text>
+            <xsl:apply-templates select="$itemBiblNode/BIBLSCOPE[(@TYPE='pg' or @TYPE='pageno')]" />
+          </xsl:if>
+        </div>
+      </xsl:when>
+      <xsl:otherwise>
+        <div class="articleauthor">
+          <xsl:if test="$itemBiblNode/BIBLSCOPE[(@TYPE='pg' or @TYPE='pageno')]">
+            <xsl:apply-templates select="$itemBiblNode/BIBLSCOPE[(@TYPE='pg' or @TYPE='pageno')]" />
+          </xsl:if>
+        </div>
+      </xsl:otherwise>
 
-        </xsl:choose>
-  </xsl:template>  
+    </xsl:choose>
+  </xsl:template>
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/templates/text/qui/qui.header.xsl b/templates/text/qui/qui.header.xsl
index 5bc48f6..be6e556 100644
--- a/templates/text/qui/qui.header.xsl
+++ b/templates/text/qui/qui.header.xsl
@@ -84,7 +84,7 @@
     </qui:block>
   </xsl:template>
 
-  <xsl:template match="ScopingPage" mode="outline">
+  <xsl:template match="ScopingPage" mode="outline" priority="101">
     <xsl:variable name="do-build-link">
       <xsl:choose>
         <xsl:when test="/Top/AuthRequired='true'">false</xsl:when>
@@ -111,8 +111,45 @@
     </qui:li>
   </xsl:template>
 
-  <xsl:template match="DIV1" mode="outline">
-    <qui:debug>TBD</qui:debug>
+  <xsl:template match="Divhead" mode="outline" priority="101" />
+
+  <xsl:template match="*" mode="outline">
+    <xsl:variable name="do-build-link">
+      <xsl:choose>
+        <xsl:when test="/Top/AuthRequired='true'">false</xsl:when>
+        <xsl:otherwise>true</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:variable name="label">
+      <xsl:choose>
+        <xsl:when test="Divhead/HEAD">
+          <xsl:value-of select="Divhead/HEAD" />
+        </xsl:when>
+        <xsl:when test="key('get-lookup',@TYPE)">
+          <xsl:value-of select="key('get-lookup', @TYPE)" />
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="@TYPE" />
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <qui:li>
+      <xsl:choose>
+        <xsl:when test="$do-build-link = 'true'">
+          <qui:link href="{Link}">
+            <xsl:value-of select="$label" />
+          </qui:link>
+        </xsl:when>
+        <xsl:otherwise>
+          <qui:span><xsl:value-of select="$label" /></qui:span>
+        </xsl:otherwise>
+      </xsl:choose>
+      <xsl:if test="DIV2|DIV3|DIV4|DIV5|DIV6|DIV7|DIV8|DIV9|DIV10">
+        <qui:ul>
+          <xsl:apply-templates select="DIV2|DIV3|DIV4|DIV5|DIV6|DIV7|DIV8|DIV9|DIV10" mode="outline" />
+        </qui:ul>
+      </xsl:if>
+    </qui:li>
   </xsl:template>
 
   <xsl:template match="Top/Item" mode="metadata">