diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index fe1323130a3..a3464a1ff88 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -218,6 +218,13 @@ label.no.thanks=No Thanks
 label.gateway=Gateway
 label.netmask=Netmask
 label.no.isos=No available ISOs
+label.bootable=Bootable
+label.featured=Featured
+label.cross.zones=Cross Zones
+label.add.iso=Add ISO
+label.url=URL
+label.disk.offering=Disk Offering
+label.generating.url=Generating URL
 
 
 label.lang.english=English
@@ -320,7 +327,7 @@ message.detach.iso.confirm=Please confirm that you want to detach the ISO from t
 message.attach.iso.confirm=Please confirm that you want to attach the ISO to the virtual instance
 message.change.offering.confirm=Please confirm that you wish to change the service offering of your virtual instance.
 message.volume.create.template.confirm=Please confirm you wish to create a template for this disk volume.  Creation of the template can range from several minutes to longer depending on the size of the volume.
-
+message.copy.iso.confirm=Please confirm you wish to copy your ISO to
 
 #Errors
 error.login=Your username/password does not match our records.
diff --git a/ui/jsp/iso.jsp b/ui/jsp/iso.jsp
index 51a19ce0ae9..0aad75117af 100644
--- a/ui/jsp/iso.jsp
+++ b/ui/jsp/iso.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"/>
 
 
 <!-- ISO detail panel (begin) -->
@@ -14,7 +11,7 @@
     <div class="main_titleicon">
         <img src="images/title_isoicon.gif" /></div>
     <h1>
-        ISO
+        <fmt:message key="label.iso"/>
     </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 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>
@@ -51,13 +48,13 @@
 	                    <div class="gridheader_loader" id="Div1">
 	                    </div>
 	                    <p id="description">
-	                        Detaching Disk &hellip;</p>
+	                        <fmt:message key="label.detaching.disk"/> &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("Zone")%>:</div>
+	                        <fmt:message key="label.zone"/>:</div>
 	                </div>
 	                <div class="grid_row_cell" style="width: 79%;">
 	                    <div class="row_celltitles" id="zonename">
@@ -77,7 +74,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">
@@ -89,7 +86,7 @@
 	            <div class="grid_rows even">
 	                <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">
@@ -101,7 +98,7 @@
 	            <div class="grid_rows odd">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
-	                        <%=t.t("Status")%>:</div>
+	                        <fmt:message key="label.status"/>:</div>
 	                </div>
 	                <div class="grid_row_cell" style="width: 79%;">
 	                    <div class="row_celltitles" id="status">
@@ -111,7 +108,7 @@
 	            <div class="grid_rows even">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
-	                        <%=t.t("Size")%>:</div>
+	                        <fmt:message key="label.size"/>:</div>
 	                </div>
 	                <div class="grid_row_cell" style="width: 79%;">
 	                    <div class="row_celltitles" id="size">
@@ -121,7 +118,7 @@
 	            <div class="grid_rows odd">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
-	                        <%=t.t("Bootable")%>:</div>
+	                        <fmt:message key="label.bootable"/>:</div>
 	                </div>
 	                <div class="grid_row_cell" style="width: 79%;">
 	                    <div class="row_celltitles" id="bootable">                      
@@ -131,14 +128,14 @@
 	            <div class="grid_rows even">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
-	                        <%=t.t("Public")%>:</div>
+	                        <fmt:message key="label.public"/>:</div>
 	                </div>
 	                <div class="grid_row_cell" style="width: 79%;">
 	                    <div class="row_celltitles" id="ispublic">                       
 	                    </div>	                
 	                    <select class="select" id="ispublic_edit" style="width: 202px; display: none;">
-	                        <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>	                 
 	                </div>
 	            </div>	 
@@ -146,14 +143,14 @@
 	            <div class="grid_rows odd">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
-	                        <%=t.t("Featured")%>:</div>
+	                        <fmt:message key="label.featured"/>:</div>
 	                </div>
 	                <div class="grid_row_cell" style="width: 79%;">
 	                    <div class="row_celltitles" id="isfeatured">                        
 	                    </div>
 	                    <select class="select" id="isfeatured_edit" style="width: 202px; display: none;">
-	                        <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>
 	                </div>
 	            </div>
@@ -161,7 +158,7 @@
 	            <div class="grid_rows even">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
-	                        <%=t.t("crossZones")%>:</div>
+	                        <fmt:message key="label.cross.zones"/>:</div>
 	                </div>
 	                <div class="grid_row_cell" style="width: 79%;">
 	                    <div class="row_celltitles" id="crossZones">
@@ -171,7 +168,7 @@
 				<div class="grid_rows odd">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
-	                        <%=t.t("OS.Type")%>:</div>
+	                        <fmt:message key="label.os.types"/>:</div>
 	                </div>
 	                <div class="grid_row_cell" style="width: 79%;">
 	                    <div class="row_celltitles" id="ostypename">
@@ -183,7 +180,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">
@@ -193,7 +190,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">
@@ -203,7 +200,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">
@@ -212,8 +209,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>
@@ -227,7 +224,7 @@
             <div class="actionpanel_button_icons">
                 <img src="images/addvm_actionicon.png" alt="Add ISO" /></div>
             <div class="actionpanel_button_links">
-                Add ISO
+				<fmt:message key="label.add.iso"/>
             </div>
         </div>
     </div>
@@ -240,50 +237,50 @@
 		<form action="#" method="post" id="form2">
 			<ol>
 				<li>
-					<label><%=t.t("name")%>:</label>
+					<label><fmt:message key="label.name"/>:</label>
 					<input class="text" type="text" name="add_iso_name" id="add_iso_name" style="width:250px"/>
 					<div id="add_iso_name_errormsg" class="dialog_formcontent_errormsg" style="display:none;"></div>
 				</li>
 				<li>
-					<label><%=t.t("display.text")%>:</label>
+					<label><fmt:message key="label.display.text"/>:</label>
 					<input class="text" type="text" name="add_iso_display_text" id="add_iso_display_text" style="width:250px"/>
 					<div id="add_iso_display_text_errormsg" class="dialog_formcontent_errormsg" style="display:none;"></div>
 				</li>
 				<li>
-					<label><%=t.t("URL")%>:</label>
+					<label><fmt:message key="label.url"/>:</label>
 					<input class="text" type="text" name="add_iso_url" id="add_iso_url" style="width:250px"/>
 					<div id="add_iso_url_errormsg" class="dialog_formcontent_errormsg" style="display:none;"></div>
 				</li>				
 				<li>
-                    <label><%=t.t("zone")%>:</label>
+                    <label><fmt:message key="label.zone"/>:</label>
                     <select class="select" id="add_iso_zone">
                     </select>
                 </li>	
 				<li>
-					<label for="add_iso_os_type"><%=t.t("os.type")%>:</label>
+					<label for="add_iso_os_type"><fmt:message key="label.os.type"/>:</label>
 					<select class="select" name="add_iso_os_type" id="add_iso_os_type">
 					</select>
 				</li>
 				<li>
-					<label for="add_iso_public"><%=t.t("bootable")%>:</label>
+					<label for="add_iso_public"><fmt:message key="label.bootable"/>:</label>
 					<select class="select" name="add_iso_bootable" id="add_iso_bootable">
-						<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="add_iso_public_container" style="display:none">
-					<label>Public?:</label>
+					<label><fmt:message key="label.public"/>?:</label>
 					<select class="select" id="add_iso_public">
-						<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>
 				
@@ -296,13 +293,13 @@
 <!-- Copy ISO Dialog (begin) -->
 <div id="dialog_copy_iso" title="Copy ISO" style="display:none">	
     <p>
-	    <%=t.t("copy.ISO.to")%>:	    
+	    <fmt:message key="message.copy.iso.confirm"/>:	    
 	</p>
 	<div class="dialog_formcontent">
 		<form action="#" method="post" id="form4">
 			<ol>				
 				<li>
-                    <label><%=t.t("zone")%>:</label>
+                    <label><fmt:message key="label.zone"/>:</label>
                     <select class="select" id="copy_iso_zone">  
                         <option value=""></option>                        
                     </select>
@@ -320,34 +317,34 @@
 		<form action="#" method="post" id="form5">
 			<ol>			   
 				<li>
-					<label><%=t.t("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>
 				<li>
-					<label><%=t.t("group")%>:</label>
+					<label><fmt:message key="label.group"/>:</label>
 					<input class="text" type="text" id="group"/>
 					<div id="group_errormsg" class="dialog_formcontent_errormsg" style="display:none;"></div>
 				</li>				
 				<li>
-                    <label><%=t.t("service.offering")%>:</label>
+                    <label><fmt:message key="label.service.offering"/>:</label>
                     <select class="select" id="service_offering">
                     </select>
                 </li>					
 				<li>
-                    <label><%=t.t("disk.offering")%>:</label>
+                    <label><fmt:message key="label.disk.offering"/>:</label>
                     <select class="select" id="disk_offering">
                     </select>
                 </li>
                 <li id="size_container">
                     <label>
-                        <%=t.t("size")%>:</label>
+                        <fmt:message key="label.size"/>:</label>
                     <input class="text" type="text" id="size" />
                     <div id="size_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                     </div>
                 </li>    		
                 <li>
-                    <label><%=t.t("hypervisor")%>:</label>
+                    <label><fmt:message key="label.hypervisor"/>:</label>
                     <select class="select" id="hypervisor">
                         <option value='XenServer'>Citrix XenServer</option>
                         <option value='VmWare'>VMware ESX</option>                            
@@ -366,7 +363,7 @@
        <div class="ui_dialog_loader">
        </div>
        <p>
-           Generating URL....</p>
+           <fmt:message key="label.generating.url"/>....</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.  -->