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 475d7bbbb..56f25d30d 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,7 +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>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 at <a href="http://github.com/mitreid-connect/">MITREid 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.
+More information about the project can be found at <a href="http://github.com/mitreid-connect/">MITREid 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>
diff --git a/openid-connect-server/src/main/webapp/WEB-INF/tags/footer.tag b/openid-connect-server/src/main/webapp/WEB-INF/tags/footer.tag
index b88ffeadd..47c75e316 100644
--- a/openid-connect-server/src/main/webapp/WEB-INF/tags/footer.tag
+++ b/openid-connect-server/src/main/webapp/WEB-INF/tags/footer.tag
@@ -15,13 +15,11 @@
 <!-- Le javascript
 ================================================== -->
 <!-- Placed at the end of the document so the pages load faster -->
-<script type="text/javascript"
-	src="resources/bootstrap2/js/bootstrap.js"></script>
+<script type="text/javascript" src="resources/bootstrap2/js/bootstrap.js"></script>
 <script type="text/javascript" src="resources/js/lib/underscore.js"></script>
 <script type="text/javascript" src="resources/js/lib/backbone.js"></script>
 <script type="text/javascript" src="resources/js/lib/purl.js"></script>
-<script type="text/javascript"
-	src="resources/js/lib/bootstrapx-clickover.js"></script>
+<script type="text/javascript" src="resources/js/lib/bootstrapx-clickover.js"></script>
 <c:if test="${js != null && js != ''}">
 	<script type="text/javascript" src="resources/js/client.js"></script>
 	<script type="text/javascript" src="resources/js/grant.js"></script>
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
index 64fd56146..fdc1d4e9f 100644
--- a/openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageAbout.tag
+++ b/openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageAbout.tag
@@ -1,6 +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>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 &raquo;</a></p>
diff --git a/openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageWelcome.tag b/openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageWelcome.tag
index b1a2f6301..73a117e33 100644
--- a/openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageWelcome.tag
+++ b/openid-connect-server/src/main/webapp/WEB-INF/tags/landingPageWelcome.tag
@@ -1,8 +1,5 @@
 <h1>Welcome!</h1>
 
-<p>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.</p>
+<p>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.</p>
 
 <p><a class="btn btn-primary btn-large" href="http://openid.net/connect/">Learn more &raquo;</a></p>
diff --git a/openid-connect-server/src/main/webapp/WEB-INF/tags/sidebar.tag b/openid-connect-server/src/main/webapp/WEB-INF/tags/sidebar.tag
index f9e0b13a4..86ab5bc49 100644
--- a/openid-connect-server/src/main/webapp/WEB-INF/tags/sidebar.tag
+++ b/openid-connect-server/src/main/webapp/WEB-INF/tags/sidebar.tag
@@ -1,5 +1,4 @@
-<%@ taglib prefix="security"
-	uri="http://www.springframework.org/security/tags"%>
+<%@ taglib prefix="security" uri="http://www.springframework.org/security/tags"%>
 <%@ taglib prefix="o" tagdir="/WEB-INF/tags"%>
 
 <div class="span2 visible-desktop">
diff --git a/openid-connect-server/src/main/webapp/WEB-INF/tags/topbar.tag b/openid-connect-server/src/main/webapp/WEB-INF/tags/topbar.tag
index ee6287ed0..85e9e436c 100644
--- a/openid-connect-server/src/main/webapp/WEB-INF/tags/topbar.tag
+++ b/openid-connect-server/src/main/webapp/WEB-INF/tags/topbar.tag
@@ -1,7 +1,6 @@
 <%@attribute name="pageName" required="false"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
-<%@ taglib prefix="security"
-	uri="http://www.springframework.org/security/tags"%>
+<%@ taglib prefix="security" uri="http://www.springframework.org/security/tags"%>
 <%@ taglib prefix="o" tagdir="/WEB-INF/tags"%>
 <c:choose>
 	<c:when test="${ not empty userInfo.preferredUsername }">
@@ -17,10 +16,8 @@
 	</c:when>
 	<c:otherwise>
 		<c:choose>
-			<c:when
-				test="${ not empty userInfo.givenName || not empty userInfo.familyName }">
-				<c:set var="longName"
-					value="${ userInfo.givenName } {$ userInfo.familyName }" />
+			<c:when test="${ not empty userInfo.givenName || not empty userInfo.familyName }">
+				<c:set var="longName" value="${ userInfo.givenName } {$ userInfo.familyName }" />
 			</c:when>
 			<c:otherwise>
 				<c:set var="longName" value="${ shortName }" />
@@ -31,10 +28,10 @@
 <div class="navbar navbar-fixed-top">
 	<div class="navbar-inner">
 		<div class="container">
-			<button class="btn btn-navbar" data-toggle="collapse"
-				data-target=".nav-collapse">
-				<span class="icon-bar"></span> <span class="icon-bar"></span> <span
-					class="icon-bar"></span>
+			<button class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+				<span class="icon-bar"></span> 
+				<span class="icon-bar"></span> 
+				<span class="icon-bar"></span>
 			</button>
 			<a class="brand" href="">${config.topbarTitle}</a>
 			<div class="nav-collapse collapse">