diff --git a/openid-connect-server/src/main/webapp/WEB-INF/server-config.xml b/openid-connect-server/src/main/webapp/WEB-INF/server-config.xml
index de803dc0e..e59c7b054 100644
--- a/openid-connect-server/src/main/webapp/WEB-INF/server-config.xml
+++ b/openid-connect-server/src/main/webapp/WEB-INF/server-config.xml
@@ -17,7 +17,6 @@
-
diff --git a/openid-connect-server/src/main/webapp/WEB-INF/tags/aboutContent.tag b/openid-connect-server/src/main/webapp/WEB-INF/tags/aboutContent.tag
new file mode 100644
index 000000000..39a9fca75
--- /dev/null
+++ b/openid-connect-server/src/main/webapp/WEB-INF/tags/aboutContent.tag
@@ -0,0 +1,25 @@
+<%@attribute name="short" required="false" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+
+
+
+
+ About
+
+ This OpenID Connect service is built from the MITREid Connect Open Source project started by The MITRE Corporation.
+
+ More »
+
+
+
+ About
+
+ This OpenID Connect service is built from the MITREid Connect Open Source project started by The MITRE Corporation.
+
+
+ More information about the project can be found on our GitHub page: MTIREid Connect on GitHub
+ There, you can submit bug reports, give feedback, or even contribute code patches for additional features you'd like to see.
+
+
+
+
\ No newline at end of file
diff --git a/openid-connect-server/src/main/webapp/WEB-INF/tags/contactContent.tag b/openid-connect-server/src/main/webapp/WEB-INF/tags/contactContent.tag
new file mode 100644
index 000000000..ba6967f95
--- /dev/null
+++ b/openid-connect-server/src/main/webapp/WEB-INF/tags/contactContent.tag
@@ -0,0 +1,22 @@
+<%@attribute name="short" required="false" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+
+
+
+
+ Contact
+
+ For more information or support, contact the administrators of this system.
+
+ Email »
+
+
+
+ Contact
+
+ For general assistance, email Bob at email@address.com.
+ To offer feedback, email Sue at email@address.com.
+ To report a system failure or bug report, email Joe at email@address.com.
+
+
+
\ No newline at end of file
diff --git a/openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageText.tag b/openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageText.tag
new file mode 100644
index 000000000..9e948e3c9
--- /dev/null
+++ b/openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageText.tag
@@ -0,0 +1,8 @@
+Welcome!
+
+OpenID Connect is a next-generation protocol built on top of the OAuth2 authorization framework.
+ OpenID Connect lets you log into a remote site using your identity without exposing your
+ credentials, like a username and password.
+
+
+Learn more »
\ No newline at end of file
diff --git a/openid-connect-server/src/main/webapp/WEB-INF/tags/statsContent.tag b/openid-connect-server/src/main/webapp/WEB-INF/tags/statsContent.tag
new file mode 100644
index 000000000..d2f88da3f
--- /dev/null
+++ b/openid-connect-server/src/main/webapp/WEB-INF/tags/statsContent.tag
@@ -0,0 +1,21 @@
+<%@attribute name="short" required="false" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+
+
+
+
+ Current Statistics
+
+ There have been ${statsSummary["userCount"]} users of this
+ system who have logged in to ${statsSummary["clientCount"]}
+ total sites, for a total of ${statsSummary["approvalCount"]} site approvals.
+
+
+
+ Current Statistics
+
+ There have been ${statsSummary["userCount"]} users of this
+ system who have logged in to ${statsSummary["clientCount"]}
+ total sites, for a total of ${statsSummary["approvalCount"]} site approvals.
+
+
\ No newline at end of file
diff --git a/openid-connect-server/src/main/webapp/WEB-INF/views/about.jsp b/openid-connect-server/src/main/webapp/WEB-INF/views/about.jsp
index 13d417608..6e8cfedc2 100644
--- a/openid-connect-server/src/main/webapp/WEB-INF/views/about.jsp
+++ b/openid-connect-server/src/main/webapp/WEB-INF/views/about.jsp
@@ -13,9 +13,7 @@
-
- This OpenID Connect service is built from the MITREid Connect Open Source project started by The MITRE Corporation.
-
+
-
Welcome!
-
-
OpenID Connect is a next-generation protocol built on top of the OAuth2 authorization framework.
- OpenID Connect lets you log into a remote site using your identity without exposing your
- credentials, like a username and password.
-
-
-
Learn more »
+
-
About
-
-
This OpenID Connect service is built from the MITREid Connect Open Source project started by The MITRE Corporation.
-
-
More »
+
-
Contact
-
-
For more information or support, contact the administrators of this system.
-
-
Email »
+
@@ -41,12 +26,7 @@
-
Current Statistics
-
-
There have been ${statsSummary["userCount"]} users of this
- system who have logged in to ${statsSummary["clientCount"]}
- total sites, for a total of ${statsSummary["approvalCount"]} site approvals.
-
+
diff --git a/openid-connect-server/src/main/webapp/WEB-INF/views/stats.jsp b/openid-connect-server/src/main/webapp/WEB-INF/views/stats.jsp
index dc12dc6ea..5228e9fad 100644
--- a/openid-connect-server/src/main/webapp/WEB-INF/views/stats.jsp
+++ b/openid-connect-server/src/main/webapp/WEB-INF/views/stats.jsp
@@ -12,12 +12,7 @@
-
Current Statistics
-
-
There have been ${statsSummary["userCount"]} users of this
- system who have logged in to ${statsSummary["clientCount"]}
- total sites, for a total of ${statsSummary["approvalCount"]} site approvals.
-
+