diff --git a/vraptor-musicjungle/src/main/resources/messages.properties b/vraptor-musicjungle/src/main/resources/messages.properties
index ded8fc970..6d1799af5 100644
--- a/vraptor-musicjungle/src/main/resources/messages.properties
+++ b/vraptor-musicjungle/src/main/resources/messages.properties
@@ -1,3 +1,5 @@
+project_description=a place to upload, download and share your favorite musics.
+
 user_added = new user added successfully.
 
 user = User
@@ -11,11 +13,15 @@ user.default = (you can use default user and password: vraptor)
 send=Send
 logout=Logout
 
+menu.home=Home
+menu.about=About
+
 music.title=Title
 music.description=Description
 music.type=Type
 music.owners = Owners
 music.upload = Music
+music.download = Download
 
 your_musics=Your musics
 new_music=Add new musics to your collection
@@ -45,6 +51,8 @@ REGGAE=Reggae
 FUNK=Funk
 OTHER=Other
 
+licence=Apache Licence
+
 # errors
 errors = Errors
 login_already_exists = There is already someone registered under this login.
diff --git a/vraptor-musicjungle/src/main/resources/messages_pt_BR.properties b/vraptor-musicjungle/src/main/resources/messages_pt_BR.properties
index 2ccdef042..51974fed6 100644
--- a/vraptor-musicjungle/src/main/resources/messages_pt_BR.properties
+++ b/vraptor-musicjungle/src/main/resources/messages_pt_BR.properties
@@ -1,3 +1,5 @@
+project_description=um lugar para baixar e compartilhar suas músicas favoritas.
+
 user_added = novo usuario adicionado com sucesso
 user = Usuário
 
@@ -10,16 +12,21 @@ user.default = (você pode usar o usuário e senha padrão: vra
 send=Enviar
 logout=Logout
 
+menu.home=Home
+menu.about=Sobre
+
 music.title=Titulo
 music.description=Descrição
 music.type=Tipo
+music.upload=Músicas
+music.download = Download
 
 your_musics=Suas músicas
 new_music=Adicione novas músicas em sua coleção
 music_added=Música adicionada
 add_music=Adicionar Música
 
-list_users=Registered users list
+list_users=Usuários
 search.music=Digite o titulo de uma má
 view=view
 
@@ -42,6 +49,8 @@ REGGAE=Reggae
 FUNK=Funk
 OTHER=Outra
 
+licence=Licença Apache
+
 # errors
 errors = Erros
 login_already_exists = Já existe alguém cadastrado com o seu login.
diff --git a/vraptor-musicjungle/src/main/webapp/WEB-INF/jsp/home/login.jsp b/vraptor-musicjungle/src/main/webapp/WEB-INF/jsp/home/login.jsp
index b09ab57a1..76fe54fe5 100644
--- a/vraptor-musicjungle/src/main/webapp/WEB-INF/jsp/home/login.jsp
+++ b/vraptor-musicjungle/src/main/webapp/WEB-INF/jsp/home/login.jsp
@@ -3,7 +3,7 @@
 
 <div class="well login-logo">
 	<span class="logo">VRaptor Music Jungle</span>
-	<span class="logo-message">a place to upload, download and share your favorite musics.</span> 
+	<span class="logo-message"><fmt:message key="project_description"/></span> 
 </div>
 
 <div class="container">
diff --git a/vraptor-musicjungle/src/main/webapp/WEB-INF/jsp/music/search.jsp b/vraptor-musicjungle/src/main/webapp/WEB-INF/jsp/music/search.jsp
index 3a88c07a9..b7adbffdb 100644
--- a/vraptor-musicjungle/src/main/webapp/WEB-INF/jsp/music/search.jsp
+++ b/vraptor-musicjungle/src/main/webapp/WEB-INF/jsp/music/search.jsp
@@ -5,10 +5,10 @@
 <table class="table table-striped table-bordered table-hover">
 	<thead>
 		<tr>
-			<th>Title</th>
-			<th>Description</th>
-			<th>Type</th>
-			<td>Owners</td>
+			<th><fmt:message key="music.title"/></th>
+			<th><fmt:message key="music.description"/></th>
+			<th><fmt:message key="music.type"/></th>
+			<td><fmt:message key="music.owners"/></td>
 			<td></td>
 			<td></td>
 		</tr>
diff --git a/vraptor-musicjungle/src/main/webapp/WEB-INF/jsp/users/home.jsp b/vraptor-musicjungle/src/main/webapp/WEB-INF/jsp/users/home.jsp
index f3cd0ec38..67d834761 100644
--- a/vraptor-musicjungle/src/main/webapp/WEB-INF/jsp/users/home.jsp
+++ b/vraptor-musicjungle/src/main/webapp/WEB-INF/jsp/users/home.jsp
@@ -54,10 +54,10 @@
 <table class="table table-striped table-bordered table-hover">
 	<thead>
 		<tr>
-			<th>Title</th>
-			<th>Description</th>
-			<th>Type</th>
-			<th>Download</th>
+			<th><fmt:message key="music.title"/></th>
+			<th><fmt:message key="music.description"/></th>
+			<th><fmt:message key="music.type"/></th>
+			<td><fmt:message key="music.download"/></td>
 		</tr>
 	</thead>
 	<tbody>
diff --git a/vraptor-musicjungle/src/main/webapp/WEB-INF/jsp/users/view.jsp b/vraptor-musicjungle/src/main/webapp/WEB-INF/jsp/users/view.jsp
index 4b380f0f2..33a51465e 100644
--- a/vraptor-musicjungle/src/main/webapp/WEB-INF/jsp/users/view.jsp
+++ b/vraptor-musicjungle/src/main/webapp/WEB-INF/jsp/users/view.jsp
@@ -5,9 +5,9 @@
 <table class="table table-striped table-bordered table-hover">
 	<thead>
 		<tr>
-			<th>Title</th>
-			<th>Description</th>
-			<th>Type</th>
+			<th><fmt:message key="music.title"/></th>
+			<th><fmt:message key="music.description"/></th>
+			<th><fmt:message key="music.type"/></th>
 			<th></th>
 			<th></th>
 		</tr>
diff --git a/vraptor-musicjungle/src/main/webapp/footer.jsp b/vraptor-musicjungle/src/main/webapp/footer.jsp
index cd2249625..1d68b98ca 100644
--- a/vraptor-musicjungle/src/main/webapp/footer.jsp
+++ b/vraptor-musicjungle/src/main/webapp/footer.jsp
@@ -1,4 +1,4 @@
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 
 	</div>
@@ -6,10 +6,10 @@
      <div class="footer v-footer">
               <p>
               	<a href="http://www.apache.org/licenses/LICENSE-2.0">
-              		Licença Apache 
+              		<fmt:message key="licence" /> 
               	</a> | VRaptor @2013 Caelum - Ensino e Inovação
              </p>
      </div>
       
 	</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/vraptor-musicjungle/src/main/webapp/header.jsp b/vraptor-musicjungle/src/main/webapp/header.jsp
index c46c56ad2..82c3fbe24 100644
--- a/vraptor-musicjungle/src/main/webapp/header.jsp
+++ b/vraptor-musicjungle/src/main/webapp/header.jsp
@@ -5,7 +5,7 @@
 <html>
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<meta name="author" content="Caelum - Ensino e Inovação"/>
+	<meta name="author" content="Caelum - Ensino e Inovação"/>
 	<meta name="reply-to" content="contato@caelum.com.br"/>
 	<meta name="description" content="<fmt:message key="meta.description"/>"/>
 	<meta name="keywords" content="sites, web, desenvolvimento, development, java, opensource"/>
@@ -25,9 +25,8 @@
 <body>
     <c:set var="path"><c:url value="/"/></c:set>
 
-	<fmt:setLocale value="${locale}"/>
-
 	<c:if test="${not empty param.language}">
+		<c:set var="lang" value="${param.language}" scope="session"/>
 		<fmt:setLocale value="${param.language}" scope="session"/>
 	</c:if>
 	
@@ -35,8 +34,12 @@
 		<div class="navbar-inner">
 			<div class="collapse navbar-collapse navbar-ex1-collapse">
 				<ul class="nav navbar-nav">
-					<li class="active"><a href="${path}"></i> Home</a></li>
-					<li><a href="${path}"></i> About</a></li>
+					<li class="active">
+						<a href="${path}"> <fmt:message key="menu.home"/> </a>
+					</li>
+					<li>
+						<a href="${path}"> <fmt:message key="menu.about"/> </a>
+					</li>
 					<li>
 						<a href="${linkTo[UsersController].list}"> 
 							<fmt:message key="list_users" />
@@ -51,13 +54,17 @@
             
 				<ul class="nav navbar-nav">
 					<li class="divider-vertical"></li>
-					<li class="active"><a href="?language=en">ENGLISH</a></li>
-					<li><a href="?language=pt_BR">PORTUGUÊS</a></li>
+					<li class="${lang eq 'en' ? 'active' : ''}">
+						<a href="?language=en">ENGLISH</a>
+					</li>
+					<li class="${lang eq 'pt_BR' ? 'active' : ''}">
+						<a href="?language=pt_BR">PORTUGUÊS</a>
+					</li>
 					<li class="divider-vertical"></li>
 				</ul>
 
 				<span class="pull-right ${not empty userInfo.user ? '' : 'hidden'}">
-					${userInfo.user.name} (<a href="${linkTo[HomeController].logout}">Logout</a>)
+					${userInfo.user.name} (<a href="${linkTo[HomeController].logout}"><fmt:message key="logout"/></a>)
 				</span>
 			</div>
 		</div>
@@ -92,4 +99,4 @@
 		</div>
 	</c:if>
 	
-	<div id="contentWrap">
\ No newline at end of file
+	<div id="contentWrap">