diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/src/main/java/org/apache/nifi/web/docs/DocumentationController.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/src/main/java/org/apache/nifi/web/docs/DocumentationController.java
index a5428cdba0..7d8ec6ca23 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/src/main/java/org/apache/nifi/web/docs/DocumentationController.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/src/main/java/org/apache/nifi/web/docs/DocumentationController.java
@@ -39,6 +39,9 @@ import org.apache.commons.lang3.StringUtils;
 @WebServlet(name = "DocumenationController", urlPatterns = {"/*"})
 public class DocumentationController extends HttpServlet {
 
+    private static final int GENERAL_LINK_COUNT = 4;
+    private static final int DEVELOPER_LINK_COUNT = 2;
+    
     // context for accessing the extension mapping
     private ServletContext servletContext;
 
@@ -82,7 +85,7 @@ public class DocumentationController extends HttpServlet {
         request.setAttribute("processors", processors);
         request.setAttribute("controllerServices", controllerServices);
         request.setAttribute("reportingTasks", reportingTasks);
-        request.setAttribute("totalComponents", processors.size() + controllerServices.size() + reportingTasks.size());
+        request.setAttribute("totalComponents", GENERAL_LINK_COUNT + processors.size() + controllerServices.size() + reportingTasks.size() + DEVELOPER_LINK_COUNT);
 
         // forward appropriately
         request.getRequestDispatcher("/WEB-INF/jsp/documentation.jsp").forward(request, response);
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
index d2397de73d..aea08d0600 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
@@ -55,11 +55,11 @@
                 <div id="processor-links" class="component-links">
                     <c:choose>
                         <c:when test="${not empty processors}">
+                            <ul>
                             <c:forEach var="entry" items="${processors}">
-                                <ul>
-                                    <li class="component-item"><a class="component-link" href="components/${entry.value}/index.html" target="component-usage">${entry.key}</a></li>
-                                </ul>
+                                <li class="component-item"><a class="component-link" href="components/${entry.value}/index.html" target="component-usage">${entry.key}</a></li>
                             </c:forEach>
+                            </ul>
                             <span class="no-matching no-components hidden">No matching processors</span>
                         </c:when>
                         <c:otherwise>
@@ -73,11 +73,11 @@
                 <div id="controller-service-links" class="component-links">
                     <c:choose>
                         <c:when test="${not empty controllerServices}">
+                            <ul>
                             <c:forEach var="entry" items="${controllerServices}">
-                                <ul>
-                                    <li class="component-item"><a class="component-link" href="components/${entry.value}/index.html" target="component-usage">${entry.key}</a></li>
-                                </ul>
+                                <li class="component-item"><a class="component-link" href="components/${entry.value}/index.html" target="component-usage">${entry.key}</a></li>
                             </c:forEach>
+                            </ul>
                             <span class="no-matching no-components hidden">No matching controller services</span>
                         </c:when>
                         <c:otherwise>
@@ -91,11 +91,11 @@
                 <div id="reporting-task-links" class="component-links">
                     <c:choose>
                         <c:when test="${not empty reportingTasks}">
+                            <ul>
                             <c:forEach var="entry" items="${reportingTasks}">
-                                <ul>
-                                    <li class="component-item"><a class="component-link" href="components/${entry.value}/index.html" target="component-usage">${entry.key}</a></li>
-                                </ul>
+                                <li class="component-item"><a class="component-link" href="components/${entry.value}/index.html" target="component-usage">${entry.key}</a></li>
                             </c:forEach>
+                            </ul>
                             <span class="no-matching no-components hidden">No matching reporting tasks</span>
                         </c:when>
                         <c:otherwise>