diff --git a/ui/new/jsp/instance.jsp b/ui/new/jsp/instance.jsp
index d464b3860a6..e8944b43877 100644
--- a/ui/new/jsp/instance.jsp
+++ b/ui/new/jsp/instance.jsp
@@ -75,12 +75,10 @@
         <div class="grid_rows odd">
             <div class="grid_row_cell" style="width: 20%;">
                 <div class="row_celltitles">
-                    <%=t.t("HA")%>:</div>
+                    <%=t.t("HA.Enabled")%>:</div>
             </div>
             <div class="grid_row_cell" style="width: 79%;">
-                <div class="row_celltitles" id="ha">
-                    <div id="icon">
-                    </div>
+                <div class="row_celltitles" id="haenable">                   
                 </div>
             </div>
         </div>
@@ -127,12 +125,10 @@
         <div class="grid_rows odd">
             <div class="grid_row_cell" style="width: 20%;">
                 <div class="row_celltitles">
-                    <%=t.t("ISO")%>:</div>
+                    <%=t.t("ISO.attached")%>:</div>
             </div>
             <div class="grid_row_cell" style="width: 79%;">
-                <div class="row_celltitles" id="iso">
-                    <div id="icon">
-                    </div>
+                <div class="row_celltitles" id="iso">                    
                 </div>
             </div>
         </div>
diff --git a/ui/new/jsp/iso.jsp b/ui/new/jsp/iso.jsp
index 6d24907e893..9b4ae7ece61 100644
--- a/ui/new/jsp/iso.jsp
+++ b/ui/new/jsp/iso.jsp
@@ -107,9 +107,7 @@
                         <%=t.t("Bootable")%>:</div>
                 </div>
                 <div class="grid_row_cell" style="width: 79%;">
-                    <div class="row_celltitles" id="bootable">
-                        <div id="icon">
-                        </div>
+                    <div class="row_celltitles" id="bootable">                      
                     </div>
                 </div>
             </div>
diff --git a/ui/new/jsp/template.jsp b/ui/new/jsp/template.jsp
index a6d4a200da3..c62233ec905 100644
--- a/ui/new/jsp/template.jsp
+++ b/ui/new/jsp/template.jsp
@@ -112,9 +112,7 @@
                         <%=t.t("Password.Enabled")%>:</div>
                 </div>
                 <div class="grid_row_cell" style="width: 79%;">
-                    <div class="row_celltitles" id="passwordenabled">
-                        <div id="icon">
-                        </div>
+                    <div class="row_celltitles" id="passwordenabled">                        
                     </div>
                     <select class="select" id="passwordenabled_edit" style="width: 202px; display: none;">
                         <option value="false">No</option>
@@ -128,9 +126,7 @@
                         <%=t.t("Public")%>:</div>
                 </div>
                 <div class="grid_row_cell" style="width: 79%;">
-                    <div class="row_celltitles" id="ispublic">
-                        <div id="icon">
-                        </div>
+                    <div class="row_celltitles" id="ispublic">                       
                     </div>
                     <select class="select" id="ispublic_edit" style="width: 202px; display: none;">
                         <option value="true">Yes</option>
@@ -144,9 +140,7 @@
                         <%=t.t("Featured")%>:</div>
                 </div>
                 <div class="grid_row_cell" style="width: 79%;">
-                    <div class="row_celltitles" id="isfeatured">
-                        <div id="icon">
-                        </div>
+                    <div class="row_celltitles" id="isfeatured">                        
                     </div>
                     <select class="select" id="isfeatured_edit" style="width: 202px; display: none;">
                         <option value="true">Yes</option>
@@ -160,9 +154,7 @@
                         <%=t.t("Cross.Zones")%>:</div>
                 </div>
                 <div class="grid_row_cell" style="width: 79%;">
-                    <div class="row_celltitles" id="crossZones">
-                        <div id="icon">
-                        </div>
+                    <div class="row_celltitles" id="crossZones">                        
                     </div>
                 </div>
             </div>
diff --git a/ui/new/scripts/cloud.core2.instance.js b/ui/new/scripts/cloud.core2.instance.js
index 4455f5fbd68..7d1ce21df9e 100644
--- a/ui/new/scripts/cloud.core2.instance.js
+++ b/ui/new/scripts/cloud.core2.instance.js
@@ -377,36 +377,44 @@ function clickInstanceGroupHeader($arrowIcon) {
     }
     
     function vmToRightPanel($midmenuItem) {
+        var json = $midmenuItem.data("jsonObj");  
+        vmJsonToDetailsTab(json, $midmenuItem);   
+    }
+     
+    function vmJsonToDetailsTab(jsonObj, $midmenuItem){
+        var $detailsTab = $("#right_panel_content #tab_content_details");  
+        $detailsTab.data("jsonObj", jsonObj);  
+    
         //details tab 
         if($midmenuItem.find("#info_icon").css("display") != "none") {                
-            $rightPanelContent.find("#after_action_info").text($midmenuItem.data("afterActionInfo"));
+            $detailsTab.find("#after_action_info").text($midmenuItem.data("afterActionInfo"));
             if($midmenuItem.find("#info_icon").hasClass("error"))
-                $rightPanelContent.find("#after_action_info_container").addClass("errorbox");
+                $detailsTab.find("#after_action_info_container").addClass("errorbox");
              else
-                $rightPanelContent.find("#after_action_info_container").removeClass("errorbox");                                        
-            $rightPanelContent.find("#after_action_info_container").show();                                         
+                $detailsTab.find("#after_action_info_container").removeClass("errorbox");                                        
+            $detailsTab.find("#after_action_info_container").show();                                         
         } 
         else {
-            $rightPanelContent.find("#after_action_info").text("");
-            $rightPanelContent.find("#after_action_info_container").hide();                
+            $detailsTab.find("#after_action_info").text("");
+            $detailsTab.find("#after_action_info_container").hide();                
         }
         
-        var jsonObj = $midmenuItem.data("jsonObj");     
+          
         var vmName = getVmName(jsonObj.name, jsonObj.displayname);        
         $rightPanelHeader.find("#vm_name").text(fromdb(vmName));	
         updateVirtualMachineStateInRightPanel(jsonObj.state);	
-        $rightPanelContent.find("#ipAddress").text(jsonObj.ipaddress);
-        $rightPanelContent.find("#zoneName").text(fromdb(jsonObj.zonename));
-        $rightPanelContent.find("#templateName").text(fromdb(jsonObj.templatename));
-        $rightPanelContent.find("#serviceOfferingName").text(fromdb(jsonObj.serviceofferingname));		
-        $rightPanelContent.find("#created").text(jsonObj.created);
-        $rightPanelContent.find("#account").text(fromdb(jsonObj.account));
-        $rightPanelContent.find("#domain").text(fromdb(jsonObj.domain));
-        $rightPanelContent.find("#hostName").text(fromdb(jsonObj.hostname));
-        $rightPanelContent.find("#group").text(fromdb(jsonObj.group));	
+        $detailsTab.find("#ipAddress").text(jsonObj.ipaddress);
+        $detailsTab.find("#zoneName").text(fromdb(jsonObj.zonename));
+        $detailsTab.find("#templateName").text(fromdb(jsonObj.templatename));
+        $detailsTab.find("#serviceOfferingName").text(fromdb(jsonObj.serviceofferingname));		
+        $detailsTab.find("#created").text(jsonObj.created);
+        $detailsTab.find("#account").text(fromdb(jsonObj.account));
+        $detailsTab.find("#domain").text(fromdb(jsonObj.domain));
+        $detailsTab.find("#hostName").text(fromdb(jsonObj.hostname));
+        $detailsTab.find("#group").text(fromdb(jsonObj.group));	
         
-        setBooleanField(jsonObj.haenable, $rightPanelContent.find("#ha"));	
-        setBooleanField((jsonObj.isoid != null && jsonObj.isoid.length > 0), $rightPanelContent.find("#iso"));	
+        setBooleanField(jsonObj.haenable, $detailsTab.find("#haenable"));	
+        setBooleanField((jsonObj.isoid != null && jsonObj.isoid.length > 0), $detailsTab.find("#iso"));	
             
         //volume tab
         //if (getHypervisorType() == "kvm") 
@@ -418,7 +426,7 @@ function clickInstanceGroupHeader($arrowIcon) {
 			success: function(json) {			    
 				var items = json.listvolumesresponse.volume;
 				if (items != null && items.length > 0) {
-					var container = $rightPanelContent.find("#tab_content_volume").empty();
+					var container = $detailsTab.find("#tab_content_volume").empty();
 					var template = $("#volume_tab_template");				
 					for (var i = 0; i < items.length; i++) {
 						var newTemplate = template.clone(true);
diff --git a/ui/new/scripts/cloud.core2.js b/ui/new/scripts/cloud.core2.js
index f2359742c46..f591494b98a 100644
--- a/ui/new/scripts/cloud.core2.js
+++ b/ui/new/scripts/cloud.core2.js
@@ -513,12 +513,12 @@ function todb(val) {
 var midmenuItemCount = 20;
 
 function setBooleanField(value, $field) {
-    if(value == "true")
-        $field.find("#icon").removeClass("cross_icon").addClass("tick_icon").show();
-    else if(value == "false")
-        $field.find("#icon").removeClass("tick_icon").addClass("cross_icon").show();	
+    if(value == "true" || value == true)
+        $field.text("Yes").show();
+    else if(value == "false" || value == false)
+        $field.text("No").show();	
     else
-        $field.find("#icon").hide();
+        $field.hide();
 }
  
 function clearLeftMenu() {
diff --git a/ui/new/scripts/cloud.core2.template.js b/ui/new/scripts/cloud.core2.template.js
index e6289de9810..f8f36b89fbb 100644
--- a/ui/new/scripts/cloud.core2.template.js
+++ b/ui/new/scripts/cloud.core2.template.js
@@ -9,24 +9,21 @@ function afterLoadTemplateJSP() {
     var $editFields = $detailsTab.find("#name_edit, #displaytext_edit, #passwordenabled_edit, #ispublic_edit, #isfeatured_edit, #ostypename_edit"); 
     $("#edit_button").bind("click", function(event){    
         $readonlyFields.hide();
-        $editFields.show();        
-        $(this).hide();
+        $editFields.show();  
         $("#cancel_button, #save_button").show()
         return false;
     });    
     $("#cancel_button").bind("click", function(event){    
         $editFields.hide();
         $readonlyFields.show();   
-        $("#save_button, #cancel_button").hide();
-        $("#edit_button").show();
+        $("#save_button, #cancel_button").hide();       
         return false;
     });
     $("#save_button").bind("click", function(event){        
         doUpdateTemplate();     
         $editFields.hide();      
         $readonlyFields.show();       
-        $("#save_button, #cancel_button").hide();
-        $("#edit_button").show();
+        $("#save_button, #cancel_button").hide();       
         return false;
     });