diff --git a/src/css/lex.css b/src/css/lex.css
index 80ed6a9..db73b12 100644
--- a/src/css/lex.css
+++ b/src/css/lex.css
@@ -50,7 +50,7 @@ list-style-type: disc;
 ol, ul,  li
 {
 clear: right;
-margin-right: 0 !important;
+margin-right: 0px !important;
 padding-right: 0 !important;
 margin-left: 2px !important;
 padding-left: 0 !important;
@@ -63,25 +63,23 @@ li
 {
 	margin-left: 0 !important;
 }
-
-/* #entry ol
+/* ol
 {
-
 	border: solid 2px black;
 }
 
-#entry li ol
+li ol
 {
 	border: solid 2px yellow;
 }
-#entry li
+li
 {
 	border: solid 2px red;
-} */
+}  */
 li li
 {
 	margin-left: 25px !important;
-	/* border: solid 2px blue; */
+	 /* border: solid 2px blue;  */
 }
 
 
diff --git a/src/jsp/jsp/displayTreeToc.jsf b/src/jsp/jsp/displayTreeToc.jsf
index 2e46a5a..e7ce56b 100644
--- a/src/jsp/jsp/displayTreeToc.jsf
+++ b/src/jsp/jsp/displayTreeToc.jsf
@@ -13,35 +13,35 @@
 <!--PRONUNCIATION-->
 <c:set value="${sessionScope.visit.query.entry.pronunciations}" target="${sessionScope.visit.helper}" property="collection"/>
 <c:if test="${ sessionScope.visit.helper.collectionSize > 0 }">
-<c:out value='<li><a href="#${sessionScope.visit.query.entry.pronunciations}">Pronunciations</a></li>' escapeXml='false' />					
+<c:out value='<li><a href="#${sessionScope.visit.helper.hashCodeForCollection}">Pronunciations</a></li>' escapeXml='false' />					
 <c:forEach var="pronunciation" items="${ sessionScope.visit.query.entry.pronunciations }"></c:forEach>
 </c:if>
 
 <!--ETYMOLOGY-->
 <c:set value="${sessionScope.visit.query.entry.etymologies}" target="${sessionScope.visit.helper}" property="collection"/>
 <c:if test="${ sessionScope.visit.helper.collectionSize > 0 }">
-<c:out value='<li><a href="#${sessionScope.visit.query.entry.etymologies}">Etymologies</a></li>' escapeXml='false' />					
+<c:out value='<li><a href="#${sessionScope.visit.helper.hashCodeForCollection}">Etymologies</a></li>' escapeXml='false' />					
 <c:forEach var="etymology" items="${ sessionScope.visit.query.entry.etymologies }"></c:forEach>
 </c:if>
 
 <!--SPELLINGS-->
 <c:set value="${sessionScope.visit.query.entry.spellings}" target="${sessionScope.visit.helper}" property="collection"/>
 <c:if test="${ sessionScope.visit.helper.collectionSize > 0 }">
-<c:out value='<li><a href="#${sessionScope.visit.query.entry.spellings}">Spellings</a></li>' escapeXml='false' />					
+<c:out value='<li><a href="#${sessionScope.visit.helper.hashCodeForCollection}">Spellings</a></li>' escapeXml='false' />					
 <c:forEach var="spelling" items="${ sessionScope.visit.query.entry.spellings }"></c:forEach>
 </c:if>
 
 <!--FUNCTIONS-->
 <c:set value="${sessionScope.visit.query.entry.functions}" target="${sessionScope.visit.helper}" property="collection"/>
 <c:if test="${ sessionScope.visit.helper.collectionSize > 0 }">
-<c:out value='<li><a href="#${sessionScope.visit.query.entry.functions}">Functions</a></li>' escapeXml='false' />					
+<c:out value='<li><a href="#${sessionScope.visit.helper.hashCodeForCollection}">Functions</a></li>' escapeXml='false' />					
 <c:forEach var="function" items="${ sessionScope.visit.query.entry.functions }"></c:forEach>
 </c:if>
 
 <!--ENCYCLOPEDIA ARTICLES-->
 <c:set value="${sessionScope.visit.query.entry.encyclopediaArticles}" target="${sessionScope.visit.helper}" property="collection"/>
 <c:if test="${ sessionScope.visit.helper.collectionSize > 0 }">
-<c:out value='<li><a href="#${sessionScope.visit.query.entry.encyclopediaArticles}">Encyclopedia Articles</a></li>' escapeXml='false' />					
+<c:out value='<li><a href="#${sessionScope.visit.helper.hashCodeForCollection}">Encyclopedia Articles</a></li>' escapeXml='false' />					
 <c:forEach var="encyclopediaArticle" items="${ sessionScope.visit.query.entry.encyclopediaArticles }"></c:forEach>
 </c:if>
 
@@ -49,11 +49,14 @@
 <c:set value="${sessionScope.visit.query.entry.definitions}" target="${sessionScope.visit.helper}" property="collection"/>
 <c:if test="${ sessionScope.visit.helper.collectionSize > 0 }">
 <li>
-<c:out value='<a href="#${sessionScope.visit.query.entry.definitions}">Definitions</a>' escapeXml='false' />					
+<c:out value='<a href="#${sessionScope.visit.helper.hashCodeForCollection}">Definitions</a>' escapeXml='false' />					
 <ol>
 <c:forEach var="definition" items="${sessionScope.visit.query.entry.definitions}">
 <li>
-<c:out value='<a href="#${definition}">Definition ${ definition.precedence + 1}</a>' escapeXml='false' />					
+<c:set target="${ sessionScope.visit.helper }" property="component" value="${definition}"/>
+<c:out value="<a name='${ sessionScope.visit.helper.hashCodeForComponent }'></a>" escapeXml="false"/>
+
+<c:out value='<a href="#${sessionScope.visit.helper.hashCodeForComponent}">Definition ${ definition.precedence + 1}</a>' escapeXml='false' />					
 
 <ol>
 
@@ -62,49 +65,50 @@
 <c:if test="${ sessionScope.visit.helper.collectionSize > 0 }">
 <c:forEach var="subdefinition" items="${ definition.subdefinitions }">
 <li>
-<c:out value='<a href="#${subdefinition}">Subdefinition ${ subdefinition.precedence + 1 }</a>' escapeXml='false' />					
+<c:set target="${ sessionScope.visit.helper }" property="component" value="${subdefinition}"/>
+<c:out value='<a href="#${sessionScope.visit.helper.hashCodeForComponent}">Subdefinition ${ subdefinition.precedence + 1 }</a>' escapeXml='false' />					
 
 <ol>
 
 <!--KEYWORD-->
 <c:set value="${subdefinition.keywords}" target="${sessionScope.visit.helper}" property="collection"/>
 <c:if test="${ sessionScope.visit.helper.collectionSize > 0 }">
-<c:out value='<li><a href="#${subdefinition.keywords}">Keywords</a></li>' escapeXml='false' />					
+<c:out value='<li><a href="#${sessionScope.visit.helper.hashCodeForCollection}">Keywords</a></li>' escapeXml='false' />					
 <c:forEach var="keyword" items="${ subdefinition.keywords }"></c:forEach>
 </c:if> 
 
 <!--MODEL SENTENCE-->
 <c:set value="${subdefinition.modelSentences}" target="${sessionScope.visit.helper}" property="collection"/>
 <c:if test="${ sessionScope.visit.helper.collectionSize > 0 }">
-<c:out value='<li><a href="#${subdefinition.modelSentences}">Model Sentences</a></li>' escapeXml='false' />					
+<c:out value='<li><a href="#${sessionScope.visit.helper.hashCodeForCollection}">Model Sentences</a></li>' escapeXml='false' />					
 <c:forEach var="modelSentence" items="${ subdefinition.modelSentences }"></c:forEach>
 </c:if> 
 
 <!--TRANSLATION EQUIVALENT-->
 <c:set value="${subdefinition.translationEquivalents}" target="${sessionScope.visit.helper}" property="collection"/>
 <c:if test="${ sessionScope.visit.helper.collectionSize > 0 }">
-<c:out value='<li><a href="#${subdefinition.translationEquivalents}">Translations</a></li>' escapeXml='false' />					
+<c:out value='<li><a href="#${sessionScope.visit.helper.hashCodeForCollection}">Translations</a></li>' escapeXml='false' />					
 <c:forEach var="translationEquivalent" items="${ subdefinition.translationEquivalents }"></c:forEach>
 </c:if> 
 
 <!--RELATED TERM-->
 <c:set value="${subdefinition.relatedTerms}" target="${sessionScope.visit.helper}" property="collection"/>
 <c:if test="${ sessionScope.visit.helper.collectionSize > 0 }">
-<c:out value='<li><a href="#${subdefinition.relatedTerms}">RelatedTerm</a></li>' escapeXml='false' />					
+<c:out value='<li><a href="#${sessionScope.visit.helper.hashCodeForCollection}">RelatedTerm</a></li>' escapeXml='false' />					
 <c:forEach var="relatedTerm" items="${ subdefinition.relatedTerms }"></c:forEach>
 </c:if> 
 
 <!--PASSAGE-->
 <c:set value="${subdefinition.passages}" target="${sessionScope.visit.helper}" property="collection"/>
 <c:if test="${ sessionScope.visit.helper.collectionSize > 0 }">
-<c:out value='<li><a href="#${subdefinition.passages}">Passages</a></li>' escapeXml='false' />					
+<c:out value='<li><a href="#${sessionScope.visit.helper.hashCodeForCollection}">Passages</a></li>' escapeXml='false' />					
 <c:forEach var="passage" items="${ subdefinition.passages }"></c:forEach>
 </c:if>
 
 <!--REGISTER-->
 <c:set value="${subdefinition.registers}" target="${sessionScope.visit.helper}" property="collection"/>
 <c:if test="${ sessionScope.visit.helper.collectionSize > 0 }">
-<c:out value='<li><a href="#${subdefinition.registers}">Registers</a></li>' escapeXml='false' />					
+<c:out value='<li><a href="#${sessionScope.visit.helper.hashCodeForCollection}">Registers</a></li>' escapeXml='false' />					
 <c:forEach var="register" items="${ subdefinition.registers }"></c:forEach>
 </c:if>
 
@@ -125,7 +129,7 @@
 <!--TRANSITIONAL DATA-->
 <c:set value="${sessionScope.visit.query.entry.transitionalData}" target="${sessionScope.visit.helper}" property="collection"/>
 <c:if test="${ sessionScope.visit.helper.collectionSize > 0 }">
-<c:out value='<li><a href="#${sessionScope.visit.query.entry.transitionalData}">Other Dictionaries</a></li>' escapeXml='false' />
+<c:out value='<li><a href="#${sessionScope.visit.helper.hashCodeForCollection}">Other Dictionaries</a></li>' escapeXml='false' />
 <c:forEach var="transitionalData" items="${ sessionScope.visit.query.entry.transitionalData }"></c:forEach>
 </c:if>