diff --git a/openid-connect-server-webapp/src/main/resources/messages_en.properties b/openid-connect-server-webapp/src/main/resources/messages_en.properties
index 16f904816..7bcd76eb8 100644
--- a/openid-connect-server-webapp/src/main/resources/messages_en.properties
+++ b/openid-connect-server-webapp/src/main/resources/messages_en.properties
@@ -1,7 +1,3 @@
-common.Edit=Edit
-common.login=Log in
-common.logout=Log out
-
 about.title=About
 about.body=\
 This OpenID Connect service is built from the MITREid Connect Open Source project, from \
@@ -15,8 +11,30 @@ There, you can submit bug reports, give feedback, or even contribute code patche
 statistics.title=Statistics
 
 home.title=Home
+home.welcome=Welcome!
+home.welcome.body=\
+OpenID Connect is an internet-scale federated identity 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>
+home.more=More
+home.about=About
+home.about.body=This OpenID Connect service is built from the MITREid Connect Open Source project, from \
+<a href="http://www.mitre.org/">The MITRE Corporation</a> and the <a href="http://kit.mit.edu/">MIT Kerberos and Internet Trust Consortium</a>.
+home.contact=Contact
+home.contact.body=\
+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 &raquo;</a>
+home.statistics=Current Statistics
+home.statistics.loading=Loading...
 
 contact.title=Contact
 contact.body=To report bugs with the MITREid Connect software itself, use the \
 <a href="https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server/issues">GitHub issue tracker</a>. \
 For problems relating to this server, contact the server's administrator.
+
+topbar.about=About
+topbar.contact=Contact
+topbar.statistics=Statistics
+topbar.home=Home
+topbar.login=Log in
+topbar.logout=Log ut
\ No newline at end of file
diff --git a/openid-connect-server-webapp/src/main/resources/messages_sv.properties b/openid-connect-server-webapp/src/main/resources/messages_sv.properties
index db6a5b94d..edc475ffc 100644
--- a/openid-connect-server-webapp/src/main/resources/messages_sv.properties
+++ b/openid-connect-server-webapp/src/main/resources/messages_sv.properties
@@ -1,9 +1,4 @@
-common.Edit=Ändra
-
-common.login=Logga in
-common.logout=Logga ut
-
-about.title=Om&nbsp;Tjänsten
+about.title=Om&nbsp;tjänsten
 about.body=\
 Denna OpenID Connect är baserad på öppen källkod ifrån projektet MITREid, skapat av \
 <a href="http://www.mitre.org/">The MITRE Corporation</a> och <a href="http://kit.mit.edu/">MIT Kerberos and Internet Trust Consortium</a>.\
@@ -16,9 +11,32 @@ Där kan du skicka in felrapporter, komma med återkoppling, eller till och med
 statistics.title=Statistik
 
 home.title=Hem
+home.welcome=Wälkommen!
+home.welcome.body=\
+OpenID Connect är ett internet-kapabelt federerat identitetsprotokoll byggt ovanpå autentiseringsramverket OAuth2. \
+OpenID Connect låter dig logga in på en webbplats med din identitet utan att avslöja dina inloggningshemligheter, som ett användarnamn och lösenord.</p>\
+<p><a class="btn btn-primary btn-large" href="http://openid.net/connect/">Lär dig mer &raquo;</a>
+home.more=Mer
+home.about=Om&nbsp;tjänsten
+home.about.body=\
+Denna OpenID Connect tjänst är byggd från det öpnna källkodsprojektet MITREid, av \
+<a href="http://www.mitre.org/">The MITRE Corporation</a> och <a href="http://kit.mit.edu/">MIT Kerberos and Internet Trust Consortium</a>.
+home.contact=Kontakt
+home.contact.body=\
+För mer information eller användarstöd, kontakta administratörerna av detta system.</p>\
+<p><a class="btn" href="mailto:idp@example.com?Subject=OpenID Connect">E-post &raquo;</a>
+home.statistics=Nuvarande statistik
+home.statistics.loading=Laddar...
 
 contact.title=Kontakt
 contact.body=\
 För att rapportera fel i själva programvaran MITREid Connect, använd \
 <a href="https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server/issues">GitHub issue tracker</a>. \
 För problem som är specifika för denna server, kontakta tjänstens administrator.
+
+topbar.about=Om&nbsp;tjänsten
+topbar.contact=Kontakt
+topbar.statistics=Statistik
+topbar.home=Hem
+topbar.login=Logga in
+topbar.logout=Logga ut
\ No newline at end of file
diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/aboutContent.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/aboutContent.tag
index da7f1f66d..13eae2ec6 100644
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/aboutContent.tag
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/aboutContent.tag
@@ -1,5 +1,5 @@
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
-<h2><spring:message code="about.title" text="About"/></h2>
+<h2><spring:message code="home.about.title" text="About"/></h2>
 <p>
-<spring:message code="about.body" text="About body"/>
+<spring:message code="home.about.body" text="About body"/>
 </p>
\ No newline at end of file
diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageAbout.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageAbout.tag
index 7c9c72f15..eb5a5e634 100644
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageAbout.tag
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageAbout.tag
@@ -1,5 +1,6 @@
-<h2>About</h2>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+<h2><spring:message code="home.about" text="About"/></h2>
 
-<p>This OpenID Connect service is built from the MITREid Connect Open Source project, from  <a href="http://www.mitre.org/">The MITRE Corporation</a> and the <a href="http://kit.mit.edu/">MIT Kerberos and Internet Trust Consortium</a>.</p>
+<p><spring:message code="home.about.body" text="About body"/></p>
 
-<p><a class="btn" href="http://github.com/mitreid-connect/">More &raquo;</a></p>
+<p><a class="btn" href="http://github.com/mitreid-connect/"><spring:message code="home.more" text="More"/> &raquo;</a></p>
diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageContact.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageContact.tag
index 5d46247d2..77960df92 100644
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageContact.tag
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageContact.tag
@@ -1,5 +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 &raquo;</a></p>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+<h2><spring:message code="home.contact" text="Contact"/></h2>
+<p>
+<spring:message code="home.contact.body" text="Contact body"/>
+</p>
diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageStats.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageStats.tag
index 9c48a3c6f..085aafcf2 100644
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageStats.tag
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageStats.tag
@@ -1,6 +1,7 @@
-<h2>Current Statistics</h2>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+<h2><spring:message code="home.statistics" text="Current Statistics"/></h2>
 
-<p id="statsloader" class="muted">Loading statistics...</p>
+<p id="statsloader" class="muted"><spring:message code="home.statistics.loading" text="Loading statistics..."/></p>
 
 <p id="stats">There have been 
 	<span class="label label-info" id="userCount">?</span> <span id="userCountLabel">user</span> 
diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageWelcome.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageWelcome.tag
index cdd991ffd..fc35394cb 100644
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageWelcome.tag
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageWelcome.tag
@@ -1,11 +1,9 @@
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
 <div class="row-fluid">
 	<div class="span2 visible-desktop"><img src="resources/images/openid_connect_large.png"/></div>
 	
 	<div class="span10">
-		<h1>Welcome!</h1>
-	
-		<p>OpenID Connect is an internet-scale federated identity 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>
+		<h1><spring:message code="home.welcome" text="Welcome!"/></h1>
+		<p><spring:message code="home.welcome.body" text="Welcome body"/></p>
 	</div>
 </div>
\ No newline at end of file
diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/topbar.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/topbar.tag
index f2ec1b083..5891648ce 100644
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/topbar.tag
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/topbar.tag
@@ -40,34 +40,34 @@
 					<ul class="nav">
 						<c:choose>
 							<c:when test="${pageName == 'Home'}">
-								<li class="active"><a href="" data-toggle="collapse" data-target=".nav-collapse"><spring:message code="home.title" text="Home"/></a></li>
+								<li class="active"><a href="" data-toggle="collapse" data-target=".nav-collapse"><spring:message code="topbar.home" text="Home"/></a></li>
 							</c:when>
 							<c:otherwise>
-								<li><a href="" data-toggle="collapse" data-target=".nav-collapse"><spring:message code="home.title" text="Home"/></a></li>
+								<li><a href="" data-toggle="collapse" data-target=".nav-collapse"><spring:message code="topbar.home" text="Home"/></a></li>
 							</c:otherwise>
 						</c:choose>
 						<c:choose>
 							<c:when test="${pageName == 'About'}">
-								<li class="active" data-toggle="collapse" data-target=".nav-collapse"><a href=""><spring:message code="about.title" text="About"/></a></li>
+								<li class="active" data-toggle="collapse" data-target=".nav-collapse"><a href=""><spring:message code="topbar.about" text="About"/></a></li>
 							</c:when>
 							<c:otherwise>
-								<li><a href="about" data-toggle="collapse" data-target=".nav-collapse"><spring:message code="about.title" text="About"/></a></li>
+								<li><a href="about" data-toggle="collapse" data-target=".nav-collapse"><spring:message code="topbar.about" text="About"/></a></li>
 							</c:otherwise>
 						</c:choose>
 						<c:choose>
 							<c:when test="${pageName == 'Statistics'}">
-								<li class="active" data-toggle="collapse" data-target=".nav-collapse"><a href=""><spring:message code="statistics.title" text="Statistics"/></a></li>
+								<li class="active" data-toggle="collapse" data-target=".nav-collapse"><a href=""><spring:message code="topbar.statistics" text="Statistics"/></a></li>
 							</c:when>
 							<c:otherwise>
-								<li><a href="stats" data-toggle="collapse" data-target=".nav-collapse"><spring:message code="statistics.title" text="Statistics"/></a></li>
+								<li><a href="stats" data-toggle="collapse" data-target=".nav-collapse"><spring:message code="topbar.statistics" text="Statistics"/></a></li>
 							</c:otherwise>
 						</c:choose>
 						<c:choose>
 							<c:when test="${pageName == 'Contact'}">
-								<li class="active" data-toggle="collapse" data-target=".nav-collapse"><a href=""><spring:message code="contact.title" text="Contact"/></a></li>
+								<li class="active" data-toggle="collapse" data-target=".nav-collapse"><a href=""><spring:message code="topbar.contact" text="Contact"/></a></li>
 							</c:when>
 							<c:otherwise>
-								<li><a href="contact" data-toggle="collapse" data-target=".nav-collapse"><spring:message code="contact.title" text="Contact"/></a></li>
+								<li><a href="contact" data-toggle="collapse" data-target=".nav-collapse"><spring:message code="topbar.contact" text="Contact"/></a></li>
 							</c:otherwise>
 						</c:choose>
 	
@@ -88,13 +88,13 @@
 							<ul class="dropdown-menu pull-right">
 								<li><a href="manage/#user/profile" data-toggle="collapse" data-target=".nav-collapse">${ longName }</a></li>
 								<li class="divider"></li>
-								<li><a href="logout" data-toggle="collapse" data-target=".nav-collapse"><i class="icon-remove"></i> <spring:message code="common.logout" text="Log out"/></a></li>
+								<li><a href="logout" data-toggle="collapse" data-target=".nav-collapse"><i class="icon-remove"></i> <spring:message code="topbar.logout" text="Log out"/></a></li>
 							</ul>
 						</li>
 	                    </security:authorize>
 	                    <security:authorize access="!hasRole('ROLE_USER')">
 	                    <li>
-	                    	<a id="loginButton" href="login" data-toggle="collapse" data-target=".nav-collapse"><i class="icon-lock icon-white"></i> <spring:message code="common.login" text="Log in"/></a>
+	                    	<a id="loginButton" href="login" data-toggle="collapse" data-target=".nav-collapse"><i class="icon-lock icon-white"></i> <spring:message code="topbar.login" text="Log in"/></a>
 	                    </li>
 	                    </security:authorize>
 	                </ul>
diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/home.jsp b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/home.jsp
index f7615f2dc..4153385eb 100644
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/home.jsp
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/home.jsp
@@ -1,5 +1,6 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 <%@ taglib prefix="o" tagdir="/WEB-INF/tags"%>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
 <%@ taglib prefix="security" uri="http://www.springframework.org/security/tags"%>
 
 <o:header title="welcome" />