diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index efed75a0089..bcd1c3f9e5b 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -284,6 +284,10 @@ label.reserved.system.ip=Reserved System IP
 label.certificate=Certificate
 label.updating=Updating
 label.resource=Resource
+label.virtual.appliance=Virtual Appliance
+label.network.domain=Network Domain
+label.nfs.storage=NFS Storage
+label.secondary.storage=Secondary Storage
 
 label.lang.english=English
 label.lang.chinese=Chinese
@@ -400,6 +404,7 @@ message.add.cluster=Add a hypervisor managed cluster for zone <b><span id="zone_
 message.add.cluster.zone=Add a hypervisor managed cluster for zone <b><span id="zone_name"></span></b>
 message.add.primary.storage=Add a new Primary Storage for zone <b><span id="zone_name"></span></b>, pod <b><span id="pod_name"></span></b>
 message.add.ip.range.to.pod=<p>Add an IP range to pod: <b><span id="pod_name_label"></span></b></p>
+message.secondary.storage=Add a new storage for zone <b><span id="zone_name"></span></b>
 message.number.zones=<h2><span> # of </span> Zones</h2>
 message.number.pods=<h2><span> # of </span> Pods</h2>
 message.number.clusters=<h2><span> # of </span> Clusters</h2>
diff --git a/ui/jsp/router.jsp b/ui/jsp/router.jsp
index ef072c16773..721d6f5d3df 100644
--- a/ui/jsp/router.jsp
+++ b/ui/jsp/router.jsp
@@ -1,13 +1,9 @@
-<%@ page import="java.util.*" %>
-
-<%@ page import="com.cloud.utils.*" %>
-
-<%
-    Locale browserLocale = request.getLocale();
-    CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale);
-%>
-
-
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<c:if test="${!empty cookie.lang}">
+	<fmt:setLocale value="${cookie.lang.value}" />
+</c:if>
+<fmt:setBundle basename="resources/messages"/>
 
 <!-- router detail panel (begin) -->
 <div class="main_title" id="right_panel_header">
@@ -16,7 +12,7 @@
         <img src="images/title_routersicon.gif" /></div>
    
     <h1>
-        Virtual Appliance
+        <fmt:message key="label.virtual.appliance"/>
     </h1>
 </div>
 <div class="contentbox" id="right_panel_content">
@@ -26,23 +22,23 @@
     </div>
     <div class="tabbox" style="margin-top: 15px;">
         <div class="content_tabs on">
-            <%=t.t("Details")%></div>
+            <fmt:message key="label.details"/></div>
     </div> 
     <div id="tab_content_details">
     	<div id="tab_spinning_wheel" class="rightpanel_mainloader_panel" style="display:none;">
               <div class="rightpanel_mainloaderbox">
                    <div class="rightpanel_mainloader_animatedicon"></div>
-                   <p>Loading &hellip;</p>    
+                   <p><fmt:message key="label.loading"/> &hellip;</p>    
               </div>               
         </div>
         <div id="tab_container">
     		<div class="grid_container">  
         	    <div class="grid_header">
             	    <div id="grid_header_title" class="grid_header_title">(title)</div>
-                    <div id="action_link" class="grid_actionbox"><p>Actions</p>
+                    <div id="action_link" class="grid_actionbox"><p><fmt:message key="label.actions"/></p>
                         <div class="grid_actionsdropdown_box" id="action_menu" style="display: none;">
                             <ul class="actionsdropdown_boxlist" id="action_list">
-                        	    <li><%=t.t("no.available.actions")%></li>
+                        	    <li><fmt:message key="label.no.actions"/></li>
                             </ul>
                         </div>
                     </div>
@@ -51,7 +47,7 @@
                         <div class="gridheader_loader" id="icon">
                         </div>
                         <p id="description">
-                            Detaching Disk &hellip;</p>
+                            <fmt:message key="label.detaching.disk"/> &hellip;</p>
                     </div>
                 </div>          
                 <div class="grid_rows odd">
@@ -76,7 +72,7 @@
                 <div class="grid_rows even">
                     <div class="grid_row_cell" style="width: 20%;">
                         <div class="row_celltitles">
-                            <%=t.t("Zone")%>:</div>
+                            <fmt:message key="label.zone"/>:</div>
                     </div>
                     <div class="grid_row_cell" style="width: 79%;">
                         <div class="row_celltitles" id="zonename">
@@ -86,7 +82,7 @@
                 <div class="grid_rows odd">
                     <div class="grid_row_cell" style="width: 20%;">
                         <div class="row_celltitles">
-                            <%=t.t("Name")%>:</div>
+                            <fmt:message key="label.name"/>:</div>
                     </div>
                     <div class="grid_row_cell" style="width: 79%;">
                         <div class="row_celltitles" id="name">
@@ -96,7 +92,7 @@
                 <div class="grid_rows even">
                     <div class="grid_row_cell" style="width: 20%;">
                         <div class="row_celltitles">
-                            <%=t.t("Public IP")%>:</div>
+                            <fmt:message key="label.public.ip"/>:</div>
                     </div>
                     <div class="grid_row_cell" style="width: 79%;">
                         <div class="row_celltitles" id="publicip">
@@ -106,7 +102,7 @@
                 <div class="grid_rows odd">
                     <div class="grid_row_cell" style="width: 20%;">
                         <div class="row_celltitles">
-                            <%=t.t("Private IP")%>:</div>
+                            <fmt:message key="label.private.ip"/>:</div>
                     </div>
                     <div class="grid_row_cell" style="width: 79%;">
                         <div class="row_celltitles" id="privateip">
@@ -116,7 +112,7 @@
                 <div class="grid_rows even">
                     <div class="grid_row_cell" style="width: 20%;">
                         <div class="row_celltitles">
-                            <%=t.t("Guest IP")%>:</div>
+                            <fmt:message key="label.guest.ip"/>:</div>
                     </div>
                     <div class="grid_row_cell" style="width: 79%;">
                         <div class="row_celltitles" id="guestipaddress">
@@ -126,7 +122,7 @@
                 <div class="grid_rows odd">
                     <div class="grid_row_cell" style="width: 20%;">
                         <div class="row_celltitles">
-                            <%=t.t("Host")%>:</div>
+                            <fmt:message key="label.host"/>:</div>
                     </div>
                     <div class="grid_row_cell" style="width: 79%;">
                         <div class="row_celltitles" id="hostname">
@@ -136,7 +132,7 @@
                 <div class="grid_rows even">
                     <div class="grid_row_cell" style="width: 20%;">
                         <div class="row_celltitles">
-                            <%=t.t("Network Domain")%>:</div>
+                            <fmt:message key="label.network.domain"/>:</div>
                     </div>
                     <div class="grid_row_cell" style="width: 79%;">
                         <div class="row_celltitles" id="networkdomain">
@@ -147,7 +143,7 @@
                 <div class="grid_rows odd">
                     <div class="grid_row_cell" style="width: 20%;">
                         <div class="row_celltitles">
-                            <%=t.t("Domain")%>:</div>
+                            <fmt:message key="label.domain"/>:</div>
                     </div>
                     <div class="grid_row_cell" style="width: 79%;">
                         <div class="row_celltitles" id="domain">
@@ -158,7 +154,7 @@
                 <div class="grid_rows even">
                     <div class="grid_row_cell" style="width: 20%;">
                         <div class="row_celltitles">
-                            <%=t.t("Account")%>:</div>
+                            <fmt:message key="label.account"/>:</div>
                     </div>
                     <div class="grid_row_cell" style="width: 79%;">
                         <div class="row_celltitles" id="account">
@@ -168,7 +164,7 @@
                 <div class="grid_rows odd">
                     <div class="grid_row_cell" style="width: 20%;">
                         <div class="row_celltitles">
-                            <%=t.t("Created")%>:</div>
+                            <fmt:message key="label.created"/>:</div>
                     </div>
                     <div class="grid_row_cell" style="width: 79%;">
                         <div class="row_celltitles" id="created">
@@ -199,7 +195,7 @@
             <ol>               
                 <li>
                     <select class="select" id="adv_search_state">
-                        <option value="">by state</option>
+                        <option value=""><fmt:message key="label.by.state"/></option>
                         <option value="Creating">Creating</option>
                         <option value="Starting">Starting</option>
                         <option value="Running">Running</option>
diff --git a/ui/jsp/secondarystorage.jsp b/ui/jsp/secondarystorage.jsp
index 090a96b0e32..fc4436a5b4b 100644
--- a/ui/jsp/secondarystorage.jsp
+++ b/ui/jsp/secondarystorage.jsp
@@ -1,17 +1,16 @@
-<%@ page import="java.util.*" %>
-<%@ page import="com.cloud.utils.*" %>
-
-<%
-    Locale browserLocale = request.getLocale();
-    CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale);
-%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<c:if test="${!empty cookie.lang}">
+	<fmt:setLocale value="${cookie.lang.value}" />
+</c:if>
+<fmt:setBundle basename="resources/messages"/>
 
 <div class="main_title" id="right_panel_header">
    
     <div class="main_titleicon">
         <img src="images/title_secondarystorageicon.gif"/></div>
    
-    <h1>Secondary Storage
+    <h1><fmt:message key="label.secondary.storage"/>
     </h1>
 </div>
 <div class="contentbox" id="right_panel_content">
@@ -21,7 +20,7 @@
     </div>
     <div class="tabbox" style="margin-top:15px;">
         <div class="content_tabs on">
-            <%=t.t("Details")%></div>        
+            <fmt:message key="label.details"/></div>        
     </div>    
     <div id="tab_content_details">
     	<div id="tab_spinning_wheel" class="rightpanel_mainloader_panel" style="display: none;">
@@ -29,7 +28,7 @@
                 <div class="rightpanel_mainloader_animatedicon">
                 </div>
                 <p>
-                    Loading &hellip;</p>
+                    <fmt:message key="label.loading"/> &hellip;</p>
             </div>
         </div>   
         <div id="tab_container">
@@ -37,11 +36,11 @@
 		        <div class="grid_header">
 	                <div id="grid_header_title" class="grid_header_title">
 	                    (title)</div>
-	                <div class="grid_actionbox" id="action_link"><p>Actions</p>
+	                <div class="grid_actionbox" id="action_link"><p><fmt:message key="label.actions"/></p>
 	                    <div class="grid_actionsdropdown_box" id="action_menu" style="display: none;">
 	                        <ul class="actionsdropdown_boxlist" id="action_list">
 	                            <li>
-	                                <%=t.t("no.available.actions")%></li>
+	                                <fmt:message key="label.no.actions"/></li>
 	                        </ul>
 	                    </div>
 	                </div>
@@ -50,13 +49,13 @@
 	                    <div class="gridheader_loader" id="icon">
 	                    </div>
 	                    <p id="description">
-	                        Waiting &hellip;</p>
+	                        <fmt:message key="label.waiting"/> &hellip;</p>
 	                </div>
 	            </div>
 		        <div class="grid_rows odd">
 		            <div class="grid_row_cell" style="width: 20%;">
 		                <div class="row_celltitles">
-		                    <%=t.t("ID")%>:</div>
+		                    <fmt:message key="label.id"/>:</div>
 		            </div>
 		            <div class="grid_row_cell" style="width: 79%;">
 		                <div class="row_celltitles" id="id">
@@ -66,7 +65,7 @@
 		        <div class="grid_rows even">
 		            <div class="grid_row_cell" style="width: 20%;">
 		                <div class="row_celltitles">
-		                    <%=t.t("name")%>:</div>
+		                    <fmt:message key="label.name"/>:</div>
 		            </div>
 		            <div class="grid_row_cell" style="width: 79%;">
 		                <div class="row_celltitles" id="name">
@@ -76,7 +75,7 @@
 				<div class="grid_rows odd">
 			        <div class="grid_row_cell" style="width: 20%;">
 			            <div class="row_celltitles">
-			                <%=t.t("zone")%>:</div>
+			                <fmt:message key="label.zone"/>:</div>
 			        </div>
 			        <div class="grid_row_cell" style="width: 79%;">
 			            <div class="row_celltitles" id="zonename">
@@ -86,7 +85,7 @@
 			    <div class="grid_rows even">
 			        <div class="grid_row_cell" style="width: 20%;">
 			            <div class="row_celltitles">
-			                <%=t.t("type")%>:</div>
+			                <fmt:message key="label.type"/>:</div>
 			        </div>
 			        <div class="grid_row_cell" style="width: 79%;">
 			            <div class="row_celltitles" id="type">
@@ -96,7 +95,7 @@
 			    <div class="grid_rows odd">
 			        <div class="grid_row_cell" style="width: 20%;">
 			            <div class="row_celltitles">
-			                <%=t.t("ip.address")%>:</div>
+			                <fmt:message key="label.ip.address"/>:</div>
 			        </div>
 			        <div class="grid_row_cell" style="width: 79%;">
 			            <div class="row_celltitles" id="ipaddress">
@@ -106,7 +105,7 @@
 			    <div class="grid_rows even">
 			        <div class="grid_row_cell" style="width: 20%;">
 			            <div class="row_celltitles">
-			                <%=t.t("state")%>:</div>
+			                <fmt:message key="label.state"/>:</div>
 			        </div>
 			        <div class="grid_row_cell" style="width: 79%;">
 			            <div class="row_celltitles" id="state">
@@ -116,7 +115,7 @@
 			    <div class="grid_rows odd">
 			        <div class="grid_row_cell" style="width: 20%;">
 			            <div class="row_celltitles">
-			                <%=t.t("version")%>:</div>
+			                <fmt:message key="label.version"/>:</div>
 			        </div>
 			        <div class="grid_row_cell" style="width: 79%;">
 			            <div class="row_celltitles" id="version">
@@ -126,7 +125,7 @@
 			    <div class="grid_rows even">
 			        <div class="grid_row_cell" style="width: 20%;">
 			            <div class="row_celltitles">
-			                <%=t.t("last.disconnected")%>:</div>
+			                <fmt:message key="label.last.disconnected"/>:</div>
 			        </div>
 			        <div class="grid_row_cell" style="width: 79%;">
 			            <div class="row_celltitles" id="disconnected">
@@ -145,7 +144,7 @@
             <div class="actionpanel_button_icons">
                 <img src="images/addvm_actionicon.png" alt="Add Secondary Storage" /></div>
             <div class="actionpanel_button_links">
-                Add Secondary Storage
+                <fmt:message key="label.add.secondary.storage"/>
             </div>
         </div>
     </div>
@@ -155,21 +154,21 @@
 <!-- Add Secondary Storage Dialog (begin) -->
 <div id="dialog_add_secondarystorage" title="Add Secondary Storage" style="display: none">
     <p>
-        Add a new storage for zone <b><span id="zone_name"></span></b>
+		<fmt:message key="message.add.secondary.storage"/>
     </p>
     <div class="dialog_formcontent">
         <form action="#" method="post" id="form1">
         <ol>
             <li>
                 <label>
-                    NFS Server:</label>
+                    <fmt:message key="label.nfs.server"/>:</label>
                 <input class="text" type="text" name="nfs_server" id="nfs_server" />
                 <div id="nfs_server_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li>
             <li>
                 <label for="path">
-                    Path:</label>
+                    <fmt:message key="label.path"/>:</label>
                 <input class="text" type="text" name="path" id="path" />
                 <div id="path_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
@@ -182,7 +181,7 @@
         <div class="ui_dialog_loader">
         </div>
         <p>
-            Adding....</p>
+            <fmt:message key="label.adding"/>....</p>
     </div>
     <!--Confirmation msg box-->
     <!--Note: for error msg, just have to add error besides everything for eg. add error(class) next to ui_dialog_messagebox error, ui_dialog_msgicon error, ui_dialog_messagebox_text error.  -->