diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index b33e65699e4..4ab3c81008a 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -115,6 +115,7 @@ label.no.alerts=No Recent Alerts
 label.host.alerts=Host Alerts
 label.disk.volume=Disk Volume
 label.snapshots=Snapshots
+label.snapshot=Snapshot
 label.accounts=Accounts
 label.recent.errors=Recent Errors
 label.no.errors=No Recent Errors
@@ -141,6 +142,7 @@ label.instances=Instances
 label.add.domain=Add Domain
 label.parent.domain=Parent Domain
 label.volumes=Volumes
+label.volume=Volume
 label.initiated.by=Initiated By
 label.owner.account=Owner Account
 label.level=Level
@@ -156,6 +158,8 @@ label.hosts=Hosts
 label.host=Host
 label.virtual.appliances=Virtual Appliances
 label.system.vms=System VMs
+label.system.vm=System VM
+label.system.vm.type=System VM Type
 label.statistics=Statistics
 label.ip.address=IP Address
 label.version=Version
@@ -163,6 +167,7 @@ label.os.preference=OS Preference
 label.last.disconnected=Last Disconnected
 label.cpu=CPU
 label.memory.total=Memory Total
+label.memory=Memory
 label.network.read=Network Read
 label.network.write=Network Write
 label.ip.or.fqdn=IP or FQDN
@@ -302,6 +307,17 @@ label.add.by.group=Add By Group
 label.security.group.name=Security Group Name
 label.add.more=Add More
 label.nfs.server=NFS Server
+label.storage.type=Storage Type
+label.offer.ha=Offer HA
+label.add.service.offering=Add Service Offering
+label.shared=Shared
+label.local=Local
+label.num.cpu.cores=# of CPU Cores
+label.cpu.mhz=CPU (in MHZ)
+label.memory.mb=Memory (in MB)
+label.interval.type=Interval Type
+label.password.enabled=Password Enabled
+label.active.sessions=Active Sessions
 
 label.lang.english=English
 label.lang.chinese=Chinese
@@ -431,6 +447,7 @@ message.zone.step.3.desc=Please enter the following info to add a new pod
 message.basic.mode.desc=Choose this network model if you do <b>*<u>not</u>*</b> want to enable any VLAN support.  All virtual instances created under this network model will be assigned an IP directly from the network and security groups are used to provide security and segregation.
 message.advanced.mode.desc=Choose this network model if you wish to enable VLAN support.  This network model provides the most flexibility in allowing administrators to provide custom network offerings such as providing firewall, vpn, or load balancer support as well as enabling direct vs virtual networking.
 message.update.ssl=Please submit a new X.509 compliant SSL certificate to be updated to each console proxy virtual instance:
+message.add.service.offering=Please fill in the following data to add a new service offering.
 
 #Errors
 error.login=Your username/password does not match our records.
diff --git a/ui/jsp/serviceoffering.jsp b/ui/jsp/serviceoffering.jsp
index 7d810311adf..efcefdd5dd7 100644
--- a/ui/jsp/serviceoffering.jsp
+++ b/ui/jsp/serviceoffering.jsp
@@ -1,12 +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"/>
 
 <div class="main_title" id="right_panel_header">
     
@@ -14,7 +11,7 @@
         <img src="images/title_serviceofferingicon.gif"/></div>
     
     <h1>
-        Service Offering
+        <fmt:message key="label.service.offering"/>
     </h1>
 </div>
 <div class="contentbox" id="right_panel_content">
@@ -24,7 +21,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;">
@@ -32,17 +29,17 @@
                 <div class="rightpanel_mainloader_animatedicon">
                 </div>
                 <p>
-                    Loading &hellip;</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,13 +48,13 @@
 	                    <div class="gridheader_loader" id="Div1">
 	                    </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">
@@ -67,7 +64,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">
@@ -79,7 +76,7 @@
 	            <div class="grid_rows odd">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
-	                        <%=t.t("display.text")%>:</div>
+	                        <fmt:message key="label.display.text"/>:</div>
 	                </div>
 	                <div class="grid_row_cell" style="width: 79%;">
 	                    <div class="row_celltitles" id="displaytext">
@@ -91,7 +88,7 @@
 	            <div class="grid_rows even">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
-	                        <%=t.t("storage.type")%>:</div>
+	                        <fmt:message key="label.storage.type"/>:</div>
 	                </div>
 	                <div class="grid_row_cell" style="width: 79%;">
 	                    <div class="row_celltitles" id="storagetype">
@@ -101,7 +98,7 @@
 	            <div class="grid_rows odd">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
-	                        <%=t.t("CPU")%>:</div>
+	                        <fmt:message key="label.cpu"/>:</div>
 	                </div>
 	                <div class="grid_row_cell" style="width: 79%;">
 	                    <div class="row_celltitles" id="cpu">
@@ -111,7 +108,7 @@
 	            <div class="grid_rows even">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
-	                        <%=t.t("memory")%>:</div>
+	                        <fmt:message key="label.memory"/>:</div>
 	                </div>
 	                <div class="grid_row_cell" style="width: 79%;">
 	                    <div class="row_celltitles" id="memory">
@@ -121,21 +118,21 @@
 	            <div class="grid_rows odd">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
-	                        <%=t.t("offer.HA")%>:</div>
+	                        <fmt:message key="label.offer.ha"/>:</div>
 	                </div>
 	                <div class="grid_row_cell" style="width: 79%;">
 	                    <div class="row_celltitles" id="offerha">
 	                    </div>
 	                    <select class="select" id="offerha_edit" style="width: 202px; display: none;">
-	                        <option value="false">No</option>
-							<option value="true">Yes</option>
+	                        <option value="false"><fmt:message key="label.no"/></option>
+							<option value="true"><fmt:message key="label.yes"/></option>
 	                    </select>
 	                </div>
 	            </div>
 	            <div class="grid_rows even">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
-	                        <%=t.t("tags")%>:</div>
+	                        <fmt:message key="label.tags"/>:</div>
 	                </div>
 	                <div class="grid_row_cell" style="width: 79%;">
 	                    <div class="row_celltitles" id="tags">
@@ -148,7 +145,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">
@@ -161,7 +158,7 @@
 	            <div class="grid_rows even">
 	                <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">
@@ -170,8 +167,8 @@
 	            </div>
 	        </div>        
 	        <div class="grid_botactionpanel">
-	        	<div class="gridbot_buttons" id="save_button" style="display:none;">Save</div>
-	            <div class="gridbot_buttons" id="cancel_button" style="display:none;">Cancel</div>
+	        	<div class="gridbot_buttons" id="save_button" style="display:none;"><fmt:message key="label.save"/></div>
+	            <div class="gridbot_buttons" id="cancel_button" style="display:none;"><fmt:message key="label.cancel"/></div>
 	        </div>  
        </div>         
     </div>
@@ -184,7 +181,7 @@
             <div class="actionpanel_button_icons">
                 <img src="images/addvm_actionicon.png" alt="Add Service Offering" /></div>
             <div class="actionpanel_button_links">
-                Add Service Offering
+                <fmt:message key="label.add.service.offering"/>
             </div>
         </div>
     </div>
@@ -193,67 +190,67 @@
 
 <!-- Add Service Offering Dialog -->
 <div id="dialog_add_service" title="Add Service Offering" style="display:none">
-	<p>Please fill in the following data to add a new Service Offering.</p>
+	<p><fmt:message key="message.add.service.offering"/></p>
 	<div class="dialog_formcontent">
 		<form action="#" method="post" id="form_acquire">
 			<ol>
 				<li>
-					<label for="user_name">Name:</label>
+					<label for="user_name"><fmt:message key="label.name"/>:</label>
 					<input class="text" type="text" name="add_service_name" id="add_service_name"/>
 					<div id="add_service_name_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
 				</li>
 				<li>
-					<label for="user_name">Display text:</label>
+					<label for="user_name"><fmt:message key="label.display.text"/>:</label>
 					<input class="text" type="text" name="add_service_display" id="add_service_display"/>
 					<div id="add_service_display_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
 				</li>
 				<li>
-					<label for="add_service_storagetype">Storage type:</label>
+					<label for="add_service_storagetype"><fmt:message key="label.storage.type"/>:</label>
 					<select class="select" name="add_service_storagetype" id="add_service_storagetype">
-					    <option value="shared">shared</option>
-						<option value="local">local</option>						
+					    <option value="shared"><fmt:message key="label.shared"/></option>
+						<option value="local"><fmt:message key="label.local"/></option>						
 					</select>
 				</li>		
 				<li>
-					<label for="user_name"># of CPU cores:</label>
+					<label for="user_name"><fmt:message key="label.num.cpu.cores"/>:</label>
 					<input class="text" type="text" name="add_service_cpucore" id="add_service_cpucore"/>
 					<div id="add_service_cpucore_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
 				</li>
 				<li>
-					<label for="user_name">CPU (in MHz):</label>
+					<label for="user_name"><fmt:message key="label.cpu.mhz"/>:</label>
 					<input class="text" type="text" name="add_service_cpu" id="add_service_cpu"/>
 					<div id="add_service_cpu_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
 				</li>
 				<li>
-					<label for="user_name">Memory (in MB):</label>
+					<label for="user_name"><fmt:message key="label.memory.mb"/>:</label>
 					<input class="text" type="text" name="add_service_memory" id="add_service_memory"/>
 					<div id="add_service_memory_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
 				</li>				
 				<li id="add_service_offerha_container">
-					<label>Offer HA?</label>
+					<label><fmt:message key="label.offer.ha"/>?</label>
 					<select class="select" id="add_service_offerha">						
-						<option value="false">No</option>
-						<option value="true">Yes</option>
+						<option value="false"><fmt:message key="label.no"/></option>
+						<option value="true"><fmt:message key="label.yes"/></option>
 					</select>
 				</li>	
 				<li id="add_service_tags_container">
                     <label for="add_service_tags">
-                        Tags:</label>
+                        <fmt:message key="label.tags"/>:</label>
                     <input class="text" type="text" id="add_service_tags" />
                     <div id="add_service_tags_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                     </div>
                 </li>	
                 <li>
 				    <label>
-				        Public?:</label>
+				        <fmt:message key="label.public"/>?:</label>
 				    <select class="select" id="public_dropdown">
-				        <option value="true">Yes</option>
-				        <option value="false">No</option>
+				        <option value="true"><fmt:message key="label.yes"/></option>
+				        <option value="false"><fmt:message key="label.no"/></option>
 				    </select>
 				</li>
 				<li id="domain_dropdown_container" style="display: none">
 				    <label>
-				        Domain:</label>
+				        <fmt:message key="label.domain"/>:</label>
 				    <select class="select" id="domain_dropdown">
 				    </select>
 				</li>    			
diff --git a/ui/jsp/snapshot.jsp b/ui/jsp/snapshot.jsp
index 617b73d066e..30be6cbe5b8 100644
--- a/ui/jsp/snapshot.jsp
+++ b/ui/jsp/snapshot.jsp
@@ -1,18 +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"/>
 
 <!-- snapshot detail panel (begin) -->
 <div class="main_title" id="right_panel_header">
     <div class="main_titleicon">
         <img src="images/title_snapshoticon.gif" /></div>
     <h1>
-        Snapshot
+        <fmt:message key="label.snapshot"/>
     </h1>
 </div>
 <div class="contentbox" id="right_panel_content">
@@ -22,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;">
@@ -30,17 +28,17 @@
 	            <div class="rightpanel_mainloader_animatedicon">
 	            </div>
 	            <p>
-	                Loading &hellip;</p>
+	                <fmt:message key="label.loading"/> &hellip;</p>
 	        </div>
 	    </div>    
         <div id="tab_container">			
 	        <div class="grid_container">
 	        	<div class="grid_header">
 	            	<div 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>
+	                            <li><fmt:message key="label.no.actions"/></li>
 	                        </ul>
 	                    </div>
 	                </div>
@@ -49,13 +47,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">
@@ -65,7 +63,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">
@@ -75,7 +73,7 @@
 	            <div class="grid_rows odd">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
-	                        <%=t.t("Volume")%>:</div>
+	                        <fmt:message key="label.volume"/>:</div>
 	                </div>
 	                <div class="grid_row_cell" style="width: 79%;">
 	                    <div class="row_celltitles" id="volume_name">
@@ -85,7 +83,7 @@
 	            <div class="grid_rows even">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
-	                        <%=t.t("Interval.Type")%>:</div>
+	                        <fmt:message key="label.interval.type"/>:</div>
 	                </div>
 	                <div class="grid_row_cell" style="width: 79%;">
 	                    <div class="row_celltitles" id="interval_type">
@@ -95,7 +93,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">
@@ -105,7 +103,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">
@@ -115,7 +113,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">
@@ -134,7 +132,7 @@
         <form action="#" method="post" id="form5">
         <ol>
             <li>
-                <label>Name:</label>
+                <label><fmt:message key="label.name"/>:</label>
                 <input class="text" type="text" id="name" />
                 <div id="name_errormsg" class="dialog_formcontent_errormsg" style="display: none;"></div>
             </li>           
@@ -150,40 +148,40 @@
 		<form action="#" method="post" id="form6">
 			<ol>
 				<li>
-					<label>Name:</label>
+					<label><fmt:message key="label.name"/>:</label>
 					<input class="text" type="text" id="name" style="width:250px"/>
 					<div id="name_errormsg" class="dialog_formcontent_errormsg" style="display:none;"></div>
 				</li>
 				<li>
-					<label>Display Text:</label>
+					<label><fmt:message key="label.display.text"/>:</label>
 					<input class="text" type="text" id="display_text" style="width:250px"/>
 					<div id="display_text_errormsg" class="dialog_formcontent_errormsg" style="display:none;"></div>
 				</li>				
 				<li>
-					<label>OS Type:</label>
+					<label><fmt:message key="label.os.type"/>:</label>
 					<select class="select" id="os_type">
 					</select>
 				</li>				
 				<li id="create_template_public_container" style="display:none">
 	                <label for="create_template_public">
-	                    Public:</label>
+	                    <fmt:message key="label.public"/>:</label>
 	                <select class="select" id="ispublic">
-	                    <option value="false">No</option>
-	                    <option value="true">Yes</option>
+	                    <option value="false"><fmt:message key="label.no"/></option>
+	                    <option value="true"><fmt:message key="label.yes"/></option>
 	                </select>
 	            </li>						
 				<li>
-					<label>Password Enabled?:</label>
+					<label><fmt:message key="label.password.enabled"/>?:</label>
 					<select class="select" id="password">						
-						<option value="false">No</option>
-						<option value="true">Yes</option>
+						<option value="false"><fmt:message key="label.no"/></option>
+						<option value="true"><fmt:message key="label.yes"/></option>
 					</select>
 				</li>				
 				<li id="isfeatured_container" style="display:none">
-					<label>Featured?:</label>
+					<label><fmt:message key="label.featured"/>?:</label>
 					<select class="select" id="isfeatured">
-					    <option value="false">No</option>
-						<option value="true">Yes</option>						
+					    <option value="false"><fmt:message key="label.no"/></option>
+						<option value="true"><fmt:message key="label.yes"/></option>						
 					</select>
 				</li>				
 			</ol>
diff --git a/ui/jsp/systemvm.jsp b/ui/jsp/systemvm.jsp
index 4623a04dd40..d0a08bcf01a 100644
--- a/ui/jsp/systemvm.jsp
+++ b/ui/jsp/systemvm.jsp
@@ -1,17 +1,15 @@
-<%@ 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_systemvmicon.gif" /></div>
     <h1>
-        System VM
+        <fmt:message key="label.system.vm"/>
     </h1>
 </div>
 <div class="contentbox" id="right_panel_content">
@@ -21,7 +19,7 @@
     </div>
     <div class="tabbox" style="margin-top: 15px;">
         <div class="content_tabs on" id="tab_details">
-            <%=t.t("details")%></div>
+            <fmt:message key="label.details"/></div>
     </div>
     <!-- Details tab (start)-->
     <div id="tab_content_details">
@@ -30,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">
@@ -38,11 +36,11 @@
 	            <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>
+	                                <fmt:message key="label.no.actions"/></li>
 	                        </ul>
 	                    </div>
 	                </div>
@@ -51,7 +49,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 +74,7 @@
 	            <div class="grid_rows even">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
-	                        <%=t.t("system.vm.type")%>:</div>
+	                        <fmt:message key="label.system.vm.type"/>:</div>
 	                </div>
 	                <div class="grid_row_cell" style="width: 79%;">
 	                    <div class="row_celltitles" id="systemvmtype">
@@ -86,7 +84,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">
@@ -96,7 +94,7 @@
 	            <div class="grid_rows even">
 	                <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">
@@ -106,7 +104,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">
@@ -116,7 +114,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">
@@ -126,7 +124,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">
@@ -136,7 +134,7 @@
 	            <div class="grid_rows even">
 	                <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">
@@ -146,7 +144,7 @@
 	            <div class="grid_rows odd">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
-	                        <%=t.t("gateway")%>:</div>
+	                        <fmt:message key="label.gateway"/>:</div>
 	                </div>
 	                <div class="grid_row_cell" style="width: 79%;">
 	                    <div class="row_celltitles" id="gateway">
@@ -156,7 +154,7 @@
 	            <div class="grid_rows even">
 	                <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">
@@ -166,7 +164,7 @@
 	            <div class="grid_rows odd" id="activeviewersessions_container" style="display:none">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
-	                        <%=t.t("active.sessions")%>:</div>
+	                        <fmt:message key="label.active.sessions"/>:</div>
 	                </div>
 	                <div class="grid_row_cell" style="width: 79%;">
 	                    <div class="row_celltitles" id="activeviewersessions">
@@ -196,7 +194,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>