diff --git a/documentation/api-reference/templates/asdoc-util.xslt b/documentation/api-reference/templates/asdoc-util.xslt
index b40bb30a7..e6eb038f7 100644
--- a/documentation/api-reference/templates/asdoc-util.xslt
+++ b/documentation/api-reference/templates/asdoc-util.xslt
@@ -416,136 +416,52 @@
 			<span>
 
 				<xsl:if test="$showProperties">
-					<a href="#propertySummary">
-						<xsl:value-of select="$asdoc_terms/row[entry[1][p/text() = 'Properties']]/entry[2]/p"/>
-					</a>
-					<xsl:if
-						test="$showPackageProperties or $showConstructors or $showMethods or $showPackageFunctions or $showEvents or $showStyles or $showEffects or $showConstants or $showPackageConstants or $showInterfaces or $showClasses or $showPackageUse or $showIncludeExamples or $additionalLinks">
-						<xsl:text>&#xA0;| </xsl:text>
-					</xsl:if>
+					<a href="#propertySummary"><xsl:value-of select="$asdoc_terms/row[entry[1][p/text() = 'Properties']]/entry[2]/p"/></a>
 				</xsl:if>
 				<xsl:if test="$showPackageProperties">
-					<a href="package.html#propertySummary">
-						<xsl:value-of select="$asdoc_terms/row[entry[1][p/text() = 'Properties']]/entry[2]/p"/>
-					</a>
-					<xsl:if
-						test="$showConstructors or $showMethods or $showPackageFunctions or $showEvents or $showStyles or $showEffects or $showConstants or $showPackageConstants or $showInterfaces or $showClasses or $showPackageUse or $showIncludeExamples or $additionalLinks">
-						<xsl:text>&#xA0;| </xsl:text>
-					</xsl:if>
+					<a href="package.html#propertySummary"><xsl:value-of select="$asdoc_terms/row[entry[1][p/text() = 'Properties']]/entry[2]/p"/></a>
 				</xsl:if>
 				<xsl:if test="$showConstructors">
-					<a href="#constructorSummary">
-						<xsl:value-of select="$asdoc_terms/row[entry[1][p/text() = 'Constructor']]/entry[2]/p"/>
-					</a>
-					<xsl:if
-						test="$showMethods or $showPackageFunctions or $showEvents or $showStyles or $showEffects or $showConstants or $showPackageConstants or $showInterfaces or $showClasses or $showPackageUse or $showIncludeExamples or $additionalLinks">
-						<xsl:text>&#xA0;| </xsl:text>
-					</xsl:if>
+					<a href="#constructorSummary"><xsl:value-of select="$asdoc_terms/row[entry[1][p/text() = 'Constructor']]/entry[2]/p"/></a>
 				</xsl:if>
 				<xsl:if test="not($showMethods=false)">
-					<a href="#methodSummary">
-						<xsl:value-of select="$asdoc_terms/row[entry[1][p/text() = 'Method']]/entry[2]/p"/>
-					</a>
-					<xsl:if
-						test="$showPackageFunctions or $showEvents or $showStyles or $showEffects or $showConstants or $showPackageConstants or $showInterfaces or $showClasses or $showPackageUse or $showIncludeExamples or $additionalLinks">
-						<xsl:text>&#xA0;| </xsl:text>
-					</xsl:if>
+					<a href="#methodSummary"><xsl:value-of select="$asdoc_terms/row[entry[1][p/text() = 'Method']]/entry[2]/p"/></a>
 				</xsl:if>
 				<xsl:if test="$showPackageFunctions">
-					<a href="package.html#methodSummary">
-						<xsl:value-of select="$asdoc_terms/row[entry[1][p/text() = 'Functions']]/entry[2]/p"/>
-					</a>
-					<xsl:if test="$showEvents or $showStyles or $showEffects or $showConstants or $showPackageConstants or $showInterfaces or $showClasses or $showPackageUse or $showIncludeExamples or $additionalLinks">
-						<xsl:text>&#xA0;| </xsl:text>
-					</xsl:if>
+					<a href="package.html#methodSummary"><xsl:value-of select="$asdoc_terms/row[entry[1][p/text() = 'Functions']]/entry[2]/p"/></a>
 				</xsl:if>
 				<xsl:if test="$showEvents">
-					<a href="#eventSummary">
-						<xsl:value-of select="$asdoc_terms/row[entry[1][p/text() = 'Events']]/entry[2]/p"/>
-					</a>
-					<xsl:if test="$showStyles or $showEffects or $showConstants or $showPackageConstants or $showInterfaces or $showClasses or $showPackageUse or $showIncludeExamples or $additionalLinks">
-						<xsl:text>&#xA0;| </xsl:text>
-					</xsl:if>
+					<a href="#eventSummary"><xsl:value-of select="$asdoc_terms/row[entry[1][p/text() = 'Events']]/entry[2]/p"/></a>
 				</xsl:if>
 				<xsl:if test="$showStyles">
-					<a href="#styleSummary">
-						<xsl:value-of select="$asdoc_terms/row[entry[1][p/text() = 'Styles']]/entry[2]/p"/>
-					</a>
-					<xsl:if test="$showSkinState or $showEffects or $showConstants or $showPackageConstants or $showInterfaces or $showClasses or $showPackageUse or $showIncludeExamples or $additionalLinks">
-						<xsl:text>&#xA0;| </xsl:text>
-					</xsl:if>
+					<a href="#styleSummary"><xsl:value-of select="$asdoc_terms/row[entry[1][p/text() = 'Styles']]/entry[2]/p"/></a>
 				</xsl:if>
 				<xsl:if test="$showSkinPart">
-					<a href="#SkinPartSummary">
-						<xsl:value-of select="$asdoc_terms/row[entry[1][p/text() = 'SkinParts']]/entry[2]/p"/>
-					</a>
-					<xsl:if test="$showSkinState or $showConstants or $showPackageConstants or $showInterfaces or $showClasses or $showPackageUse or $showIncludeExamples or $additionalLinks">
-						<xsl:text>&#xA0;| </xsl:text>
-					</xsl:if>
+					<a href="#SkinPartSummary"><xsl:value-of select="$asdoc_terms/row[entry[1][p/text() = 'SkinParts']]/entry[2]/p"/></a>
 				</xsl:if>
 				<xsl:if test="$showSkinState">
-					<a href="#SkinStateSummary">
-						<xsl:value-of select="$asdoc_terms/row[entry[1][p/text() = 'SkinStates']]/entry[2]/p"/>
-					</a>					
-					<xsl:if test="$showEffects or $showConstants or $showPackageConstants or $showInterfaces or $showClasses or $showPackageUse or $showIncludeExamples or $additionalLinks">
-						<xsl:text>&#xA0;| </xsl:text>
-					</xsl:if>
+					<a href="#SkinStateSummary"><xsl:value-of select="$asdoc_terms/row[entry[1][p/text() = 'SkinStates']]/entry[2]/p"/></a>
 				</xsl:if>
 				<xsl:if test="$showEffects">
-					<a href="#effectSummary">
-						<xsl:value-of select="$asdoc_terms/row[entry[1][p/text() = 'Effects']]/entry[2]/p"/>
-					</a>
-					<xsl:if test="$showConstants or $showPackageConstants or $showInterfaces or $showClasses or $showPackageUse or $showIncludeExamples or $additionalLinks">
-						<xsl:text>&#xA0;| </xsl:text>
-					</xsl:if>
+					<a href="#effectSummary"><xsl:value-of select="$asdoc_terms/row[entry[1][p/text() = 'Effects']]/entry[2]/p"/></a>
 				</xsl:if>
 				<xsl:if test="$showConstants">
-					<a href="#constantSummary">
-						<xsl:value-of select="$asdoc_terms/row[entry[1][p/text() = 'Constants']]/entry[2]/p"/>
-					</a>
-					<xsl:if test="$showPackageConstants or $showInterfaces or $showClasses or $showPackageUse or $showIncludeExamples or $additionalLinks">
-						<xsl:text>&#xA0;| </xsl:text>
-					</xsl:if>
+					<a href="#constantSummary"><xsl:value-of select="$asdoc_terms/row[entry[1][p/text() = 'Constants']]/entry[2]/p"/></a>
 				</xsl:if>
 				<xsl:if test="$showPackageConstants">
-					<a href="package.html#constantSummary">
-						<xsl:value-of select="$asdoc_terms/row[entry[1][p/text() = 'Constants']]/entry[2]/p"/>
-					</a>
-					<xsl:if test="$showInterfaces or $showClasses or $showPackageUse or $showIncludeExamples or $additionalLinks">
-						<xsl:text>&#xA0;| </xsl:text>
-					</xsl:if>
+					<a href="package.html#constantSummary"><xsl:value-of select="$asdoc_terms/row[entry[1][p/text() = 'Constants']]/entry[2]/p"/></a>
 				</xsl:if>
 				<xsl:if test="$showInterfaces">
-					<a href="package-detail.html#interfaceSummary">
-						<xsl:value-of select="$asdoc_terms/row[entry[1][p/text() = 'Interfaces']]/entry[2]/p"/>
-					</a>
-					<xsl:if test="$showClasses or $showPackageUse or $showIncludeExamples or $additionalLinks">
-						<xsl:text>&#xA0;| </xsl:text>
-					</xsl:if>
+					<a href="package-detail.html#interfaceSummary"><xsl:value-of select="$asdoc_terms/row[entry[1][p/text() = 'Interfaces']]/entry[2]/p"/></a>
 				</xsl:if>
 				<xsl:if test="$showClasses">
-					<a href="package-detail.html#classSummary">
-						<xsl:value-of select="$asdoc_terms/row[entry[1][p/text() = 'Classes']]/entry[2]/p"/>
-					</a>
-					<xsl:if test="$showPackageUse or $showIncludeExamples or $additionalLinks">
-						<xsl:text>&#xA0;| </xsl:text>
-					</xsl:if>
+					<a href="package-detail.html#classSummary"><xsl:value-of select="$asdoc_terms/row[entry[1][p/text() = 'Classes']]/entry[2]/p"/></a>
 				</xsl:if>
 				<xsl:if test="$showPackageUse">
-					<a href="package-use.html">
-						<xsl:value-of select="$asdoc_terms/row[entry[1][p/text() = 'Use']]/entry[2]/p"/>
-					</a>
-					<xsl:if test="$showIncludeExamples or $additionalLinks">
-						<xsl:text>&#xA0;| </xsl:text>
-					</xsl:if>
+					<a href="package-use.html"><xsl:value-of select="$asdoc_terms/row[entry[1][p/text() = 'Use']]/entry[2]/p"/></a>
 				</xsl:if>
 				<xsl:if test="$showIncludeExamples">
-					<a href="#includeExamplesSummary">
-						<xsl:value-of select="$asdoc_terms/row[entry[1][p/text() = 'Examples']]/entry[2]/p"/>
-					</a>
-					<xsl:if test="$additionalLinks">
-						<xsl:text>&#xA0;| </xsl:text>
-					</xsl:if>
+					<a href="#includeExamplesSummary"><xsl:value-of select="$asdoc_terms/row[entry[1][p/text() = 'Examples']]/entry[2]/p"/></a>
 				</xsl:if>
 				<xsl:if test="$additionalLinks">
 					<xsl:copy-of select="$additionalLinks"/>
diff --git a/documentation/api-reference/templates/asdoc.js b/documentation/api-reference/templates/asdoc.js
index 731fe65b8..124c3a1ac 100644
--- a/documentation/api-reference/templates/asdoc.js
+++ b/documentation/api-reference/templates/asdoc.js
@@ -120,39 +120,55 @@ function titleBar_setSubNav(showConstants,showProperties,showStyles,showSkinPart
 {
     if (isEclipse() || top.titlebar)
     {
+        var borderStyle = "solid 1px #333";
         findTitleTableObject("propertiesLink").style.display = showProperties ? "inline" : "none";
-        findTitleTableObject("propertiesBar").style.display = (showProperties && (showPackageProperties || showConstructor || showMethods || showPackageFunctions || showEvents || showStyles || showSkinPart || showSkinState || showEffects || showConstants || showPackageConstants || showInterfaces || showClasses || showPackageUse || showExamples)) ? "inline" : "none";
+        findTitleTableObject("propertiesLink").style.borderRight = (showProperties && (showPackageProperties || showConstructor || showMethods || showPackageFunctions || showEvents || showStyles || showSkinPart || showSkinState || showEffects || showConstants || showPackageConstants || showInterfaces || showClasses || showPackageUse || showExamples)) ? borderStyle : "none";
+        // findTitleTableObject("propertiesBar").style.display = (showProperties && (showPackageProperties || showConstructor || showMethods || showPackageFunctions || showEvents || showStyles || showSkinPart || showSkinState || showEffects || showConstants || showPackageConstants || showInterfaces || showClasses || showPackageUse || showExamples)) ? "inline" : "none";
         findTitleTableObject("packagePropertiesLink").style.display = showPackageProperties ? "inline" : "none";
-        findTitleTableObject("packagePropertiesBar").style.display = (showPackageProperties && (showConstructor || showMethods || showPackageFunctions || showEvents || showStyles || showSkinPart || showSkinState || showConstants || showEffects || showPackageConstants || showInterfaces || showClasses || showPackageUse || showExamples)) ? "inline" : "none";
+        findTitleTableObject("packagePropertiesLink").style.borderRight = (showPackageProperties && (showConstructor || showMethods || showPackageFunctions || showEvents || showStyles || showSkinPart || showSkinState || showConstants || showEffects || showPackageConstants || showInterfaces || showClasses || showPackageUse || showExamples)) ? borderStyle : "none";
+        // findTitleTableObject("packagePropertiesBar").style.display = (showPackageProperties && (showConstructor || showMethods || showPackageFunctions || showEvents || showStyles || showSkinPart || showSkinState || showConstants || showEffects || showPackageConstants || showInterfaces || showClasses || showPackageUse || showExamples)) ? "inline" : "none";
         findTitleTableObject("constructorLink").style.display = showConstructor ? "inline" : "none";
-        findTitleTableObject("constructorBar").style.display = (showConstructor && (showMethods || showPackageFunctions || showEvents || showStyles || showSkinPart || showSkinState || showEffects || showConstants || showPackageConstants || showInterfaces || showClasses || showPackageUse || showExamples)) ? "inline" : "none";
+        findTitleTableObject("constructorLink").style.borderRight = (showConstructor && (showMethods || showPackageFunctions || showEvents || showStyles || showSkinPart || showSkinState || showEffects || showConstants || showPackageConstants || showInterfaces || showClasses || showPackageUse || showExamples)) ? borderStyle : "none";
+        // findTitleTableObject("constructorBar").style.display = (showConstructor && (showMethods || showPackageFunctions || showEvents || showStyles || showSkinPart || showSkinState || showEffects || showConstants || showPackageConstants || showInterfaces || showClasses || showPackageUse || showExamples)) ? "inline" : "none";
         findTitleTableObject("methodsLink").style.display = showMethods ? "inline" : "none";
-        findTitleTableObject("methodsBar").style.display = (showMethods && (showPackageFunctions || showEvents || showStyles || showSkinPart || showSkinState || showEffects || showConstants || showPackageConstants || showInterfaces || showClasses || showPackageUse || showExamples)) ? "inline" : "none";
+        findTitleTableObject("methodsLink").style.borderRight = (showMethods && (showPackageFunctions || showEvents || showStyles || showSkinPart || showSkinState || showEffects || showConstants || showPackageConstants || showInterfaces || showClasses || showPackageUse || showExamples)) ? borderStyle : "none";
+        // findTitleTableObject("methodsBar").style.display = (showMethods && (showPackageFunctions || showEvents || showStyles || showSkinPart || showSkinState || showEffects || showConstants || showPackageConstants || showInterfaces || showClasses || showPackageUse || showExamples)) ? "inline" : "none";
         findTitleTableObject("packageFunctionsLink").style.display = showPackageFunctions ? "inline" : "none";
-        findTitleTableObject("packageFunctionsBar").style.display = (showPackageFunctions && (showEvents || showStyles || showSkinPart || showSkinState || showEffects || showConstants || showPackageConstants || showInterfaces || showClasses || showPackageUse || showExamples)) ? "inline" : "none";
+        findTitleTableObject("packageFunctionsLink").style.borderRight = (showPackageFunctions && (showEvents || showStyles || showSkinPart || showSkinState || showEffects || showConstants || showPackageConstants || showInterfaces || showClasses || showPackageUse || showExamples)) ? borderStyle : "none";
+        // findTitleTableObject("packageFunctionsBar").style.display = (showPackageFunctions && (showEvents || showStyles || showSkinPart || showSkinState || showEffects || showConstants || showPackageConstants || showInterfaces || showClasses || showPackageUse || showExamples)) ? "inline" : "none";
         findTitleTableObject("eventsLink").style.display = showEvents ? "inline" : "none";
-        findTitleTableObject("eventsBar").style.display = (showEvents && (showStyles || showSkinPart || showSkinState || showEffects || showConstants || showPackageConstants || showInterfaces || showClasses || showPackageUse || showExamples)) ? "inline" : "none";
+        findTitleTableObject("eventsLink").style.borderRight = (showEvents && (showStyles || showSkinPart || showSkinState || showEffects || showConstants || showPackageConstants || showInterfaces || showClasses || showPackageUse || showExamples)) ? borderStyle : "none";
+        // findTitleTableObject("eventsBar").style.display = (showEvents && (showStyles || showSkinPart || showSkinState || showEffects || showConstants || showPackageConstants || showInterfaces || showClasses || showPackageUse || showExamples)) ? "inline" : "none";
         findTitleTableObject("stylesLink").style.display = showStyles ? "inline" : "none";
-        findTitleTableObject("stylesBar").style.display = (showStyles && (showSkinPart || showSkinState || showEffects || showConstants || showPackageConstants || showInterfaces || showClasses || showPackageUse || showExamples)) ? "inline" : "none";
+        findTitleTableObject("stylesLink").style.borderRight = (showStyles && (showSkinPart || showSkinState || showEffects || showConstants || showPackageConstants || showInterfaces || showClasses || showPackageUse || showExamples)) ? borderStyle : "none";
+        // findTitleTableObject("stylesBar").style.display = (showStyles && (showSkinPart || showSkinState || showEffects || showConstants || showPackageConstants || showInterfaces || showClasses || showPackageUse || showExamples)) ? "inline" : "none";
         
         findTitleTableObject("SkinPartLink").style.display = showSkinPart ? "inline" : "none";
-        findTitleTableObject("SkinPartBar").style.display = (showSkinPart && (showSkinState || showEffects || showConstants || showPackageConstants || showInterfaces || showClasses || showPackageUse || showExamples)) ? "inline" : "none";
+        findTitleTableObject("SkinPartLink").style.borderRight = (showSkinPart && (showSkinState || showEffects || showConstants || showPackageConstants || showInterfaces || showClasses || showPackageUse || showExamples)) ? borderStyle : "none";
+        // findTitleTableObject("SkinPartBar").style.display = (showSkinPart && (showSkinState || showEffects || showConstants || showPackageConstants || showInterfaces || showClasses || showPackageUse || showExamples)) ? "inline" : "none";
         
         findTitleTableObject("SkinStateLink").style.display = showSkinState ? "inline" : "none";
-	findTitleTableObject("SkinStateBar").style.display = (showSkinState && (showEffects || showConstants || showPackageConstants || showInterfaces || showClasses || showPackageUse || showExamples)) ? "inline" : "none";
+	    findTitleTableObject("SkinStateLink").style.borderRight = (showSkinState && (showEffects || showConstants || showPackageConstants || showInterfaces || showClasses || showPackageUse || showExamples)) ? borderStyle : "none";
+        // findTitleTableObject("SkinStateBar").style.display = (showSkinState && (showEffects || showConstants || showPackageConstants || showInterfaces || showClasses || showPackageUse || showExamples)) ? "inline" : "none";
                 
         findTitleTableObject("effectsLink").style.display = showEffects ? "inline" : "none";
-        findTitleTableObject("effectsBar").style.display = (showEffects && (showConstants || showPackageConstants || showInterfaces || showClasses || showPackageUse || showExamples)) ? "inline" : "none";
+        findTitleTableObject("effectsLink").style.borderRight = (showEffects && (showConstants || showPackageConstants || showInterfaces || showClasses || showPackageUse || showExamples)) ? borderStyle : "none";
+        // findTitleTableObject("effectsBar").style.display = (showEffects && (showConstants || showPackageConstants || showInterfaces || showClasses || showPackageUse || showExamples)) ? "inline" : "none";
         findTitleTableObject("constantsLink").style.display = showConstants ? "inline" : "none";
-        findTitleTableObject("constantsBar").style.display = (showConstants && (showPackageConstants || showInterfaces || showClasses || showPackageUse || showExamples)) ? "inline" : "none";
+        findTitleTableObject("constantsLink").style.borderRight = (showConstants && (showPackageConstants || showInterfaces || showClasses || showPackageUse || showExamples)) ? borderStyle : "none";
+        // findTitleTableObject("constantsBar").style.display = (showConstants && (showPackageConstants || showInterfaces || showClasses || showPackageUse || showExamples)) ? "inline" : "none";
         findTitleTableObject("packageConstantsLink").style.display = showPackageConstants ? "inline" : "none";
-        findTitleTableObject("packageConstantsBar").style.display = (showPackageConstants && (showInterfaces || showClasses || showPackageUse || showExamples)) ? "inline" : "none";
+        findTitleTableObject("packageConstantsLink").style.borderRight = (showPackageConstants && (showInterfaces || showClasses || showPackageUse || showExamples)) ? borderStyle : "none";
+        // findTitleTableObject("packageConstantsBar").style.display = (showPackageConstants && (showInterfaces || showClasses || showPackageUse || showExamples)) ? "inline" : "none";
         findTitleTableObject("interfacesLink").style.display = showInterfaces ? "inline" : "none";
-        findTitleTableObject("interfacesBar").style.display = (showInterfaces && (showClasses || showPackageUse || showExamples)) ? "inline" : "none";
+        findTitleTableObject("interfacesLink").style.borderRight = (showInterfaces && (showClasses || showPackageUse || showExamples)) ? borderStyle : "none";
+        // findTitleTableObject("interfacesBar").style.display = (showInterfaces && (showClasses || showPackageUse || showExamples)) ? "inline" : "none";
         findTitleTableObject("classesLink").style.display = showClasses ? "inline" : "none";
-        findTitleTableObject("classesBar").style.display = (showClasses && (showPackageUse || showExamples)) ? "inline" : "none";
+        findTitleTableObject("classesLink").style.borderRight = (showClasses && (showPackageUse || showExamples)) ? borderStyle : "none";
+        // findTitleTableObject("classesBar").style.display = (showClasses && (showPackageUse || showExamples)) ? "inline" : "none";
         findTitleTableObject("packageUseLink").style.display = showPackageUse ? "inline" : "none";
-        findTitleTableObject("packageUseBar").style.display = (showPackageUse && showExamples) ? "inline" : "none";
+        findTitleTableObject("packageUseLink").style.borderRight = (showPackageUse && showExamples) ? borderStyle : "none";
+        // findTitleTableObject("packageUseBar").style.display = (showPackageUse && showExamples) ? "inline" : "none";
         findTitleTableObject("examplesLink").style.display = showExamples ? "inline" : "none";
     }
 }
@@ -221,12 +237,20 @@ function setInheritedVisible(show, selectorText)
                 
             if (rules[i].selectorText == ".showInherited" + selectorText)
                 rules[i].style.display = show ? "none" : "";
+
+            if (rules[i].selectorText == "table.hideInherited" + selectorText)
+                rules[i].style.display = show ? "block" : "none";
+            
+            if (rules[i].selectorText == "table.showInherited" + selectorText)
+                rules[i].style.display = show ? "none" : "block";
         }
     }
     else
     {
         document.styleSheets[0].addRule(".hideInherited" + selectorText, show ? "display:inline" : "display:none");
         document.styleSheets[0].addRule(".showInherited" + selectorText, show ? "display:none" : "display:inline");
+        document.styleSheets[0].addRule("table.hideInherited" + selectorText, show ? "display:block" : "display:none");
+        document.styleSheets[0].addRule("table.showInherited" + selectorText, show ? "display:none" : "display:block");
     }
     setCookie("showInherited" + selectorText, show ? "true" : "false", new Date(3000,1,1,1,1), "/", document.location.domain);
     setRowColors(show, selectorText);
diff --git a/documentation/api-reference/templates/style.css b/documentation/api-reference/templates/style.css
index 68507187f..5a0828f2a 100644
--- a/documentation/api-reference/templates/style.css
+++ b/documentation/api-reference/templates/style.css
@@ -582,7 +582,7 @@ html>body .listing pre
 	.titleTable tr td.titleTableSubNav a {
 	padding-right: 6px;
 	padding-left: 6px;
-	border-right: solid 1px #000;
+	border-right: solid 1px #333;
 }
 .titleTable tr td.titleTableTopNav a:last-of-type,
 	.titleTable tr td.titleTableSubNav a:last-of-type,
@@ -605,7 +605,7 @@ html>body .listing pre
 		align-items: center;
 		background-size: contain;
 		align-self: stretch;
-		min-height: 44px;
+		min-height: 32px;
 		flex-grow: 1;
 		padding-left: 10px;
 		padding-right: 10px;
@@ -657,4 +657,77 @@ html>body .listing pre
 	.titleTable tr td.titleTableSearch {
 		display: none;
 	}
+
+	/* title bar in a frame */
+	.titleTable.titleTableFrame tr {
+		flex-wrap: unset;
+	}
+	.titleTable.titleTableFrame tr td.titleTableTopNav {
+		flex-grow: 3;
+	}
+	.titleTable.titleTableFrame tr td.titleTableTitle {
+		flex-grow: 1;
+	}
+}
+@media only screen and (max-width: 450px) {
+	.titleTable.titleTableFrame tr td.titleTableTopNav a:not(#noFramesLink1),
+		.titleTable.titleTableFrame tr td.titleTableSubNav a {
+		display: none !important;
+	}
+}
+
+
+table.hideInheritedConstant {
+	display: none;
+}
+table.showInheritedConstant {
+	display: block;
+}
+table.hideInheritedProtectedConstant {
+	display: none;
+}
+table.showInheritedProtectedConstant {
+	display: block;
+}
+table.hideInheritedProperty {
+	display: none;
+}
+table.showInheritedProperty {
+	display: block;
+}
+table.hideInheritedProtectedProperty {
+	display: none;
+}
+table.showInheritedProtectedProperty {
+	display: block;
+}
+table.hideInheritedMethod {
+	display: none;
+}
+table.showInheritedMethod {
+	display: block;
+}
+table.hideInheritedProtectedMethod {
+	display: none;
+}
+table.showInheritedProtectedMethod {
+	display: block;
+}
+table.hideInheritedEvent {
+	display: none;
+}
+table.showInheritedEvent {
+	display: block;
+}
+table.hideInheritedStyle {
+	display: none;
+}
+table.showInheritedStyle {
+	display: block;
+}
+table.hideInheritedEffect {
+	display: none;
+}
+table.showInheritedEffect {
+	display: block;
 }
\ No newline at end of file
diff --git a/documentation/api-reference/templates/title-bar.html b/documentation/api-reference/templates/title-bar.html
index 9dcda19d9..c94f86e5e 100644
--- a/documentation/api-reference/templates/title-bar.html
+++ b/documentation/api-reference/templates/title-bar.html
@@ -8,7 +8,7 @@
 	</head>
 	<body>
 		<a name="top"></a>
-		<table class="titleTable" cellpadding="0" cellspacing="0">
+		<table class="titleTable titleTableFrame" cellpadding="0" cellspacing="0">
 			<tbody>
 				<tr>
 					<td class="titleTableTitle" align="left">ActionScript&#xA0;3.0&#xA0;Language&#xA0;and&#xA0;Components&#xA0;Reference</td>
@@ -16,7 +16,7 @@
 						<a target="classFrame" href="package-summary.html" onclick="loadClassListFrame('all-classes.html')">All Packages</a>
 						<a target="classFrame" href="class-summary.html" onclick="loadClassListFrame('all-classes.html')">All Classes</a>
 						<a target="classFrame" href="all-index-A.html" onclick="loadClassListFrame('index-list.html')">Index</a>
-						<a href="" onclick="top.location=top.classFrame.location">No Frames</a>
+						<a id="noFramesLink1" href="" onclick="top.location=top.classFrame.location">No Frames</a>
 					</td>
 					<td class="titleTableLogo" align="right" rowspan="3">
 						<picture>
@@ -27,7 +27,37 @@
 				<tr class="titleTableRow2">
 					<td class="titleTableSubTitle" id="subTitle" align="left">&#xA0;</td>
 					<td class="titleTableSubNav" id="subNav" align="right">
-					<a id="propertiesLink" href="#top" onclick="javascript:titleBar_gotoClassFrameAnchor('propertySummary');" style="display:none">Properties</a><span id="propertiesBar" style="display:none"> | </span><a id="packagePropertiesLink" href="#top" onclick="javascript:titleBar_gotoClassFrameAnchor('propertySummary');" style="display:none">Properties</a><span id="packagePropertiesBar" style="display:none"> | </span><a id="constructorLink" href="#top" onclick="javascript:titleBar_gotoClassFrameAnchor('constructorSummary');" style="display:none">Constructor</a><span id="constructorBar" style="display:none"> | </span><a id="methodsLink" href="#top" onclick="javascript:titleBar_gotoClassFrameAnchor('methodSummary');" style="display:none">Methods</a><span id="methodsBar" style="display:none"> | </span><a id="packageFunctionsLink" href="#top" onclick="javascript:titleBar_gotoClassFrameAnchor('methodSummary');" style="display:none">Functions</a><span id="packageFunctionsBar" style="display:none"> | </span><a id="eventsLink" href="#top" onclick="javascript:titleBar_gotoClassFrameAnchor('eventSummary');" style="display:none">Events</a><span id="eventsBar" style="display:none"> | </span><a id="stylesLink" href="#top" onclick="javascript:titleBar_gotoClassFrameAnchor('styleSummary');" style="display:none">Styles</a><span id="stylesBar" style="display:none"> | </span><a id="SkinPartLink" href="#top" onclick="javascript:titleBar_gotoClassFrameAnchor('SkinPartSummary');" style="display:none"> Skin Parts </a><span id="SkinPartBar" style="display:none"> | </span><a id="SkinStateLink" href="#top" onclick="javascript:titleBar_gotoClassFrameAnchor('SkinStateSummary');" style="display:none"> Skin States </a><span id="SkinStateBar" style="display:none"> | </span><a id="effectsLink" href="#top" onclick="javascript:titleBar_gotoClassFrameAnchor('effectSummary');" style="display:none">Effects</a><span id="effectsBar" style="display:none"> | </span><a id="constantsLink" href="#top" onclick="javascript:titleBar_gotoClassFrameAnchor('constantSummary');" style="display:none">Constants</a><span id="constantsBar" style="display:none"> | </span><a id="packageConstantsLink" href="#top" onclick="javascript:titleBar_gotoClassFrameAnchor('constantSummary');" style="display:none">Constants</a><span id="packageConstantsBar" style="display:none"> | </span><a id="interfacesLink" href="#top" onclick="javascript:titleBar_gotoClassFrameAnchor('interfaceSummary');" style="display:none">Interfaces</a><span id="interfacesBar" style="display:none"> | </span><a id="classesLink" href="#top" onclick="javascript:titleBar_gotoClassFrameAnchor('classSummary');" style="display:none">Classes</a><span id="classesBar" style="display:none"> | </span><a id="packageUseLink" href="#top" onclick="javascript:titleBar_gotoClassFrameAnchor('package-use.html');" style="display:none">Use</a><span id="packageUseBar" style="display:none"> | </span><a id="examplesLink" href="#top" onclick="javascript:titleBar_gotoClassFrameAnchor('includeExamplesSummary');" style="display:none">Examples</a>
+					<a id="propertiesLink" href="#top" onclick="javascript:titleBar_gotoClassFrameAnchor('propertySummary');" style="display:none">Properties</a>
+					<span id="propertiesBar" style="display:none"> | </span>
+					<a id="packagePropertiesLink" href="#top" onclick="javascript:titleBar_gotoClassFrameAnchor('propertySummary');" style="display:none">Properties</a>
+					<span id="packagePropertiesBar" style="display:none"> | </span>
+					<a id="constructorLink" href="#top" onclick="javascript:titleBar_gotoClassFrameAnchor('constructorSummary');" style="display:none">Constructor</a>
+					<span id="constructorBar" style="display:none"> | </span>
+					<a id="methodsLink" href="#top" onclick="javascript:titleBar_gotoClassFrameAnchor('methodSummary');" style="display:none">Methods</a>
+					<span id="methodsBar" style="display:none"> | </span>
+					<a id="packageFunctionsLink" href="#top" onclick="javascript:titleBar_gotoClassFrameAnchor('methodSummary');" style="display:none">Functions</a>
+					<span id="packageFunctionsBar" style="display:none"> | </span>
+					<a id="eventsLink" href="#top" onclick="javascript:titleBar_gotoClassFrameAnchor('eventSummary');" style="display:none">Events</a>
+					<span id="eventsBar" style="display:none"> | </span>
+					<a id="stylesLink" href="#top" onclick="javascript:titleBar_gotoClassFrameAnchor('styleSummary');" style="display:none">Styles</a>
+					<span id="stylesBar" style="display:none"> | </span>
+					<a id="SkinPartLink" href="#top" onclick="javascript:titleBar_gotoClassFrameAnchor('SkinPartSummary');" style="display:none">Skin Parts</a>
+					<span id="SkinPartBar" style="display:none"> | </span>
+					<a id="SkinStateLink" href="#top" onclick="javascript:titleBar_gotoClassFrameAnchor('SkinStateSummary');" style="display:none">Skin States</a>
+					<span id="SkinStateBar" style="display:none"> | </span>
+					<a id="effectsLink" href="#top" onclick="javascript:titleBar_gotoClassFrameAnchor('effectSummary');" style="display:none">Effects</a>
+					<span id="effectsBar" style="display:none"> | </span>
+					<a id="constantsLink" href="#top" onclick="javascript:titleBar_gotoClassFrameAnchor('constantSummary');" style="display:none">Constants</a>
+					<span id="constantsBar" style="display:none"> | </span>
+					<a id="packageConstantsLink" href="#top" onclick="javascript:titleBar_gotoClassFrameAnchor('constantSummary');" style="display:none">Constants</a>
+					<span id="packageConstantsBar" style="display:none"> | </span>
+					<a id="interfacesLink" href="#top" onclick="javascript:titleBar_gotoClassFrameAnchor('interfaceSummary');" style="display:none">Interfaces</a>
+					<span id="interfacesBar" style="display:none"> | </span>
+					<a id="classesLink" href="#top" onclick="javascript:titleBar_gotoClassFrameAnchor('classSummary');" style="display:none">Classes</a>
+					<span id="classesBar" style="display:none"> | </span>
+					<a id="packageUseLink" href="#top" onclick="javascript:titleBar_gotoClassFrameAnchor('package-use.html');" style="display:none">Use</a>
+					<span id="packageUseBar" style="display:none"> | </span>
+					<a id="examplesLink" href="#top" onclick="javascript:titleBar_gotoClassFrameAnchor('includeExamplesSummary');" style="display:none">Examples</a>
 					</td>
 				</tr>
 				<tr class="titleTableRow3">