diff --git a/Workbench/webproxy/container_files/httpd/index.html b/Workbench/webproxy/container_files/httpd/index.html
index e629226..1a184af 100644
--- a/Workbench/webproxy/container_files/httpd/index.html
+++ b/Workbench/webproxy/container_files/httpd/index.html
@@ -8,17 +8,10 @@ <h3>Welcome to the InCommon TAP Workbench!</h3>
 <br /><br />
 The system contains the following TAP components (click the links to access each component in its own tab):
 <ul>
-<li><a href="https://__CSPHOSTNAME__/idp/status" target="TAP-WB-IDP">Shibboleth IdP (4.0.1) status</a></li>
-<li><a href="https://__CSPHOSTNAME__/idpui/" target="TAP-WB-IDPUI">Shibboleth IdP UI (1.7.0)</a></li>
-<li>Shibboleth SPs:</li>
-<ul>
-  <li><a href="https://__CSPHOSTNAME__/grouperSSO/Shibboleth.sso/Status" target="TAP-WB-gSP">Grouper SP (3.2.0) status</a></li>
-  <li><a href="https://__CSPHOSTNAME__/MPSSO/Shibboleth.sso/Status" target="TAP-WB-mSP">midPoint SP (3.1.0) status</a></li>
-  <li><a href="https://__CSPHOSTNAME__/registrySSO/Shibboleth.sso/Status" target="TAP-WB-cSP">COmanage SP (3.2.0) status</a></li>
-</ul>
 <li><a href="https://__CSPHOSTNAME__/grouper" target="TAP-WB-GROUPER">Grouper (2.5.37.1)</a></li>
 <li><a href="https://__CSPHOSTNAME__/midpoint" target="TAP-WB-MIDPOINT">midPoint (4.2)</a></li>
 <li><a href="https://__CSPHOSTNAME__/registry" target="TAP-WB-COMANAGE">COmanage (3.3.1)</a></li>
+<li><a href="https://__CSPHOSTNAME__/idpui/" target="TAP-WB-IDPUI">Shibboleth IdP UI (1.7.0)</a></li>
 </ul>
 <br />
 The system also contains the following downstream/target applications:
@@ -26,14 +19,24 @@ <h3>Welcome to the InCommon TAP Workbench!</h3>
 <li><a href="https://__CSPHOSTNAME__/wordpress/" target="TAP-WB-WORDPRESS">WordPress</a></li>
 </ul>
 <br />
- In addition, the following applications are available:
+The following repository and message exchange monitoring tools are available:
 <ul>
 <li><a href="https://__CSPHOSTNAME__/rabbit" target="TAP-WB-RABBIT">Rabbit MQ</a></li>
 <li><a href="https://__CSPHOSTNAME__/ldapadmin" target="TAP-WB-LDAPADMIN">LDAP Admin</a></li>
 <li><a href="https://__CSPHOSTNAME__/phpmyadmin" target="TAP-WB-SQLADMIN">SQL Admin</a></li>
 </ul>
-<br /><br />
-<br /><br />
-<a href="https://__CSPHOSTNAME__/status" target="TAP-WB-STATUS">Status</a>
+<br />
+Shibboleth SAML Identity Provider and Service Providers:
+<ul>
+<li><a href="https://__CSPHOSTNAME__/idp/status" target="TAP-WB-IDP">Shibboleth IdP (4.0.1) status</a></li>
+<li>Shibboleth SPs:</li>
+<ul>
+  <li><a href="https://__CSPHOSTNAME__/grouperSSO/Shibboleth.sso/Status" target="TAP-WB-gSP">Grouper SP (3.2.0) status</a></li>
+  <li><a href="https://__CSPHOSTNAME__/MPSSO/Shibboleth.sso/Status" target="TAP-WB-mSP">midPoint SP (3.1.0) status</a></li>
+  <li><a href="https://__CSPHOSTNAME__/registrySSO/Shibboleth.sso/Status" target="TAP-WB-cSP">COmanage SP (3.2.0) status</a></li>
+</ul>
+</ul>
+<br /><br /><br />
+<a href="https://__CSPHOSTNAME__/status" target="TAP-WB-STATUS">Container Status</a>