diff --git a/ui/jsp/instance.jsp b/ui/jsp/instance.jsp
index 27c842f8665..9aee6f1bdd0 100644
--- a/ui/jsp/instance.jsp
+++ b/ui/jsp/instance.jsp
@@ -1063,7 +1063,7 @@
 			</div>
 		</div>
 	</div>
-    <div class="grid_rows even">
+    <div class="grid_rows odd">
         <div class="grid_row_cell" style="width: 20%;">
             <div class="row_celltitles">
                 <%=t.t("Created")%>:</div>
diff --git a/ui/jsp/iso.jsp b/ui/jsp/iso.jsp
index fe84bc9cb5a..1de5abd4fc8 100644
--- a/ui/jsp/iso.jsp
+++ b/ui/jsp/iso.jsp
@@ -152,7 +152,19 @@
 	                    </div>
 	                </div>
 	            </div>
-	            <div class="grid_rows even">
+				<div class="grid_rows even">
+	                <div class="grid_row_cell" style="width: 20%;">
+	                    <div class="row_celltitles">
+	                        <%=t.t("OS.Type")%>:</div>
+	                </div>
+	                <div class="grid_row_cell" style="width: 79%;">
+	                    <div class="row_celltitles" id="ostypename">
+	                    </div>
+	                    <select class="select" id="ostypename_edit" style="width: 202px; display: none;">                      
+	                    </select>
+	                </div>
+	            </div>
+	            <div class="grid_rows odd">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
 	                        <%=t.t("Account")%>:</div>
@@ -162,7 +174,7 @@
 	                    </div>
 	                </div>
 	            </div>
-				<div class="grid_rows odd">
+				<div class="grid_rows even">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
 	                        <%=t.t("Domain")%>:</div>
diff --git a/ui/jsp/template.jsp b/ui/jsp/template.jsp
index a3e2d13cefe..80779697bdd 100644
--- a/ui/jsp/template.jsp
+++ b/ui/jsp/template.jsp
@@ -203,7 +203,7 @@
 						</div>
 					</div>
 				</div>
-	            <div class="grid_rows odd">
+	            <div class="grid_rows even">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
 	                        <%=t.t("Created")%>:</div>
diff --git a/ui/scripts/cloud.core.iso.js b/ui/scripts/cloud.core.iso.js
index 89f38f8575c..dff9cbe2a91 100644
--- a/ui/scripts/cloud.core.iso.js
+++ b/ui/scripts/cloud.core.iso.js
@@ -233,7 +233,8 @@ function isoJsonToDetailsTab() {
     
     $thisTab.find("#displaytext").text(fromdb(jsonObj.displaytext));
     $thisTab.find("#displaytext_edit").val(fromdb(jsonObj.displaytext));
-    
+    $thisTab.find("#ostypename").text(fromdb(jsonObj.ostypename));
+    $thisTab.find("#ostypename_edit").val(jsonObj.ostypeid);    
     $thisTab.find("#account").text(fromdb(jsonObj.account));
 	$thisTab.find("#domain").text(fromdb(jsonObj.domain));
                       
@@ -313,7 +314,9 @@ function isoClearDetailsTab() {
     $thisTab.find("#displaytext").text("");
     $thisTab.find("#displaytext_edit").val("");
     
-    $thisTab.find("#account").text("");    
+    $thisTab.find("#account").text("");  
+	$thisTab.find("#domain").text("");
+	$thisTab.find("#ostypename_edit").val(null);   
     $thisTab.find("#size").text("");  
 	$thisTab.find("#status").text(""); 
 	$thisTab.find("#bootable").text("");
@@ -355,8 +358,8 @@ var isoActionMap = {
 
 function doEditISO($actionLink, $detailsTab, $midmenuItem1) {   
     //var $detailsTab = $("#right_panel_content #tab_content_details");  
-    var $readonlyFields  = $detailsTab.find("#name, #displaytext, #ispublic");
-    var $editFields = $detailsTab.find("#name_edit, #displaytext_edit, #ispublic_edit"); 
+    var $readonlyFields  = $detailsTab.find("#name, #displaytext, #ispublic, #ostypename");
+    var $editFields = $detailsTab.find("#name_edit, #displaytext_edit, #ispublic_edit, #ostypename_edit"); 
            
     $readonlyFields.hide();
     $editFields.show();  
@@ -389,7 +392,12 @@ function doEditISO2($actionLink, $detailsTab, $midmenuItem1, $readonlyFields, $e
 	array1.push("&id="+id);
 							
 	var name = $detailsTab.find("#name_edit").val();
-	array1.push("&name="+todb(name));
+	array1.push("&name="+todb(name));
+	
+	var oldOsTypeId = jsonObj.ostypeid;
+	var newOsTypeId = $detailsTab.find("#ostypename_edit").val();
+	if(newOsTypeId != oldOsTypeId)
+	    array1.push("&ostypeid="+newOsTypeId);
 	
 	var displaytext = $detailsTab.find("#displaytext_edit").val();
 	array1.push("&displayText="+todb(displaytext));