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
index 39a9fca75..eb4fd6e5c 100644
--- a/openid-connect-server/src/main/webapp/WEB-INF/tags/aboutContent.tag
+++ b/openid-connect-server/src/main/webapp/WEB-INF/tags/aboutContent.tag
@@ -1,25 +1,8 @@
-<%@attribute name="short" required="false" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-
-<c:choose>
- <c:when test="${short == 'true'}">
- <!-- Display short version of About page -->
- <h2>About</h2>
-
- <p>This OpenID Connect service is built from the MITREid Connect Open Source project started by The MITRE Corporation.</p>
-
- <p><a class="btn" href="http://github.com/mitreid-connect/">More »</a></p>
- </c:when>
- <c:when test="${short == 'false' || empty short }">
- <!-- Display long version of about page -->
- <h2>About</h2>
- <p>
- This OpenID Connect service is built from the MITREid Connect Open Source project started by The MITRE Corporation.
- </p>
- <p>
- More information about the project can be found on our GitHub page: <a href="http://github.com/mitreid-connect/">MTIREid Connect on GitHub</a>
- There, you can submit bug reports, give feedback, or even contribute code patches for additional features you'd like to see.
- </p>
- </c:when>
-</c:choose>
-
\ No newline at end of file
+<h2>About</h2>
+<p>
+This OpenID Connect service is built from the MITREid Connect Open Source project started by The MITRE Corporation.
+</p>
+<p>
+More information about the project can be found on our GitHub page: <a href="http://github.com/mitreid-connect/">MTIREid Connect on GitHub</a>
+There, you can submit bug reports, give feedback, or even contribute code patches for additional features you'd like to see.
+</p>
\ 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
index ba6967f95..6d74c9747 100644
--- a/openid-connect-server/src/main/webapp/WEB-INF/tags/contactContent.tag
+++ b/openid-connect-server/src/main/webapp/WEB-INF/tags/contactContent.tag
@@ -1,22 +1,6 @@
-<%@attribute name="short" required="false" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-
-<c:choose>
- <c:when test="${short == 'true'}">
- <!-- Display short version of Contact page -->
- <h2>Contact</h2>
-
- <p>For more information or support, contact the administrators of this system.</p>
-
- <p><a class="btn" href="mailto:idp@example.com?Subject=OpenID Connect">Email »</a></p>
- </c:when>
- <c:when test="${short == 'false' || empty short }">
- <!-- Display long version of Contact page -->
- <h2>Contact</h2>
- <p>
- For general assistance, email Bob at <a href="mailto:email@address.com?Subject=OIDC%20Server%20Assistance">email@address.com</a>.
- To offer feedback, email Sue at <a href="mailto:email@address.com?Subject=OIDC%20Server%20Feedback">email@address.com</a>.
- To report a system failure or bug report, email Joe at <a href="mailto:email@address.com?Subject=OIDC%20Server%20Failure">email@address.com</a>.
- </p>
- </c:when>
-</c:choose>
\ No newline at end of file
+<h2>Contact</h2>
+<p>
+For general assistance, email Bob at <a href="mailto:email@address.com?Subject=OIDC%20Server%20Assistance">email@address.com</a>.
+To offer feedback, email Sue at <a href="mailto:email@address.com?Subject=OIDC%20Server%20Feedback">email@address.com</a>.
+To report a system failure or bug report, email Joe at <a href="mailto:email@address.com?Subject=OIDC%20Server%20Failure">email@address.com</a>.
+</p>
diff --git a/openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageAbout.tag b/openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageAbout.tag
new file mode 100644
index 000000000..35ac079bb
--- /dev/null
+++ b/openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageAbout.tag
@@ -0,0 +1,5 @@
+<h2>About</h2>
+
+<p>This OpenID Connect service is built from the MITREid Connect Open Source project started by The MITRE Corporation.</p>
+
+<p><a class="btn" href="http://github.com/mitreid-connect/">More »</a></p>
\ No newline at end of file
diff --git a/openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageContact.tag b/openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageContact.tag
new file mode 100644
index 000000000..ef5fc1f0f
--- /dev/null
+++ b/openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageContact.tag
@@ -0,0 +1,5 @@
+<h2>Contact</h2>
+
+<p>For more information or support, contact the administrators of this system.</p>
+
+<p><a class="btn" href="mailto:idp@example.com?Subject=OpenID Connect">Email »</a></p>
\ No newline at end of file
diff --git a/openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageStats.tag b/openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageStats.tag
new file mode 100644
index 000000000..eddbfbc38
--- /dev/null
+++ b/openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageStats.tag
@@ -0,0 +1,5 @@
+<h2>Current Statistics</h2>
+
+<p>There have been <span class="label label-info">${statsSummary["userCount"]}</span> users of this
+ system who have logged in to <span class="label label-info">${statsSummary["clientCount"]}</span>
+ total sites, for a total of <span class="label label-info">${statsSummary["approvalCount"]}</span> site approvals.</p>
\ 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/landingPageWelcome.tag
similarity index 100%
rename from openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageText.tag
rename to openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageWelcome.tag
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
index d2f88da3f..d735a9213 100644
--- a/openid-connect-server/src/main/webapp/WEB-INF/tags/statsContent.tag
+++ b/openid-connect-server/src/main/webapp/WEB-INF/tags/statsContent.tag
@@ -1,21 +1,5 @@
-<%@attribute name="short" required="false" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<h2>Current Statistics</h2>
-<c:choose>
- <c:when test="${short == 'true'}">
- <!-- Display short version of Statistics page -->
- <h2>Current Statistics</h2>
-
- <p>There have been <span class="label label-info">${statsSummary["userCount"]}</span> users of this
- system who have logged in to <span class="label label-info">${statsSummary["clientCount"]}</span>
- total sites, for a total of <span class="label label-info">${statsSummary["approvalCount"]}</span> site approvals.</p>
- </c:when>
- <c:when test="${short == 'false' || empty short }">
- <!-- Display long version of Statistics page -->
- <h2>Current Statistics</h2>
-
- <p>There have been <span class="label label-info">${statsSummary["userCount"]}</span> users of this
- system who have logged in to <span class="label label-info">${statsSummary["clientCount"]}</span>
- total sites, for a total of <span class="label label-info">${statsSummary["approvalCount"]}</span> site approvals.</p>
- </c:when>
-</c:choose>
\ No newline at end of file
+<p>There have been <span class="label label-info">${statsSummary["userCount"]}</span> users of this
+ system who have logged in to <span class="label label-info">${statsSummary["clientCount"]}</span>
+ total sites, for a total of <span class="label label-info">${statsSummary["approvalCount"]}</span> site approvals.</p>
\ No newline at end of file
diff --git a/openid-connect-server/src/main/webapp/WEB-INF/views/home.jsp b/openid-connect-server/src/main/webapp/WEB-INF/views/home.jsp
index 8a7138cfb..0bc3f67ab 100644
--- a/openid-connect-server/src/main/webapp/WEB-INF/views/home.jsp
+++ b/openid-connect-server/src/main/webapp/WEB-INF/views/home.jsp
@@ -10,15 +10,15 @@
<div class="span10">
<!-- Main hero unit for a primary marketing message or call to action -->
<div class="hero-unit">
- <o:landingPageText/>
+ <o:landingPageWelcome/>
</div>
<!-- Example row of columns -->
<div class="row-fluid">
<div class="span6">
- <o:aboutContent short="true"/>
+ <o:landingPageAbout/>
</div>
<div class="span6">
- <o:contactContent short="true"/>
+ <o:landingPageContact/>
</div>
</div>
@@ -26,7 +26,7 @@
<!-- Example row of columns -->
<div class="row-fluid">
<div class="span12">
- <o:statsContent short="true"/>
+ <o:landingPageStats/>
</div>
</div>