diff --git a/setup/db/create-schema.sql b/setup/db/create-schema.sql
index e83a29a4da7..b45ef5b9412 100755
--- a/setup/db/create-schema.sql
+++ b/setup/db/create-schema.sql
@@ -929,7 +929,7 @@ CREATE TABLE `cloud`.`load_balancer` (
 CREATE TABLE  `cloud`.`storage_pool` (
   `id` bigint unsigned UNIQUE NOT NULL,
   `name` varchar(255) COMMENT 'should be NOT NULL',
-  `uuid` varchar(255) NOT NULL,
+  `uuid` varchar(255),
   `pool_type` varchar(32) NOT NULL,
   `port` int unsigned NOT NULL,
   `data_center_id` bigint unsigned NOT NULL,
diff --git a/ui/new/css/main.css b/ui/new/css/main.css
index c5ace3c9d30..6d1875d42f7 100644
--- a/ui/new/css/main.css
+++ b/ui/new/css/main.css
@@ -3198,7 +3198,7 @@ a:hover.search_button {
 }
 
 .network_dgbox {
-	width:440px;
+	width:500px;
 	height:auto;
 	float:left;
 	margin:20px 0 0 10px;
@@ -3207,7 +3207,7 @@ a:hover.search_button {
 }
 
 .networkdg_zonepanel {
-	width:440px;
+	width:500px;
 	height:75px;
 	float:left;
 	margin:0;
@@ -3219,7 +3219,7 @@ a:hover.search_button {
 	height:71px;
 	float:left;
 	background:url(../images/network_zonecloud.gif) no-repeat top left;
-	margin:0 0 0 109px;
+	margin:0 0 0 169px;
 	display:inline;
 	padding:0;
 }
@@ -3246,7 +3246,7 @@ a:hover.search_button {
 }
 
 .networkswitchpanel {
-	width:440px;
+	width:500px;
 	height:auto;
 	float:left;
 	margin:0;
@@ -3254,7 +3254,7 @@ a:hover.search_button {
 }
 
 .networkswitch_titlebox {
-	width:370px;
+	width:430px;
 	height:19px;
 	float:left;
 	background:#fefbdc repeat top left;
@@ -3287,7 +3287,7 @@ a:hover.search_button {
 }
 
 .networkswitch_midpanel {
-	width:420px;
+	width:480px;
 	height:auto;
 	float:left;
 	background:url(../images/vlan_barbg.gif) repeat-y top left;
@@ -3299,7 +3299,7 @@ a:hover.search_button {
 
 
 .networkswitch_vlanpanel {
-	width:404px;
+	width:464px;
 	height:auto;
 	float:left;
 	margin:35px 0 0 16px;
@@ -3308,14 +3308,58 @@ a:hover.search_button {
 }
 
 .networkswitch_vlanconnect {
-	width:404px;
+	width:464px;
 	height:12px;
 	float:left;
+	position:relative;
 	background:url(../images/vlan_connect.gif) no-repeat top left;
 	margin:26px 0 0 0;
 	padding:0;
 }
 
+.networkswitch_infodropdown {
+	width:200px;
+	height:auto;
+	background:#FFF;
+	border:1px solid #999;
+	position:absolute;
+	top:5px;
+	left:8px;
+	margin:0;
+	padding:0 0 10px 0;
+}
+
+.networkswitch_infodropdown_textbox {
+	width:180px;
+	height:auto;
+	float:left;
+	margin:0 0 0 10px;
+	display:inline;
+	padding:0;
+}
+
+.networkswitch_infodropdown_textbox li{
+	width:180px;
+	height:auto;
+	float:left;
+	margin:10px 0 0 0;
+	color:#333;
+	font-size:11px;
+	font-weight:bold;
+	list-style:none;
+	display:inline;
+	padding:0;
+}
+
+.networkswitch_infodropdown_textbox_label {
+	width:60px;
+	height:auto;
+	float:left;
+	font-weight:normal;
+	margin:1px 0 0 0;
+	padding:0;
+}
+
 .networkswitch_vlan_infoicon {
 	width:12px;
 	height:15px;
@@ -3333,7 +3377,7 @@ a:hover.search_button {
 }
 
 .networkswitch_vlan_detailsbox {
-	width:167px;
+	width:230px;
 	height:auto;
 	float:left;
 	background:#e9e9e9 url(../images/networkswitch_detailsbox.gif) repeat-x top left;
@@ -3341,16 +3385,16 @@ a:hover.search_button {
 	border-right:2px solid #d1d1d1;
 	border-left:1px solid #dedede;
 	border-bottom:1px solid #dedede;
-	margin:-20px 0 0 30px;
+	margin:-20px 0 0 20px;
 	display:inline;
 	padding:0 0 8px 0;
 }
 
 .networkswitch_vlan_detailsbox_textbox {
-	width:150px;
+	width:225px;
 	height:auto;
 	float:left;
-	margin:6px 0 0 8px;
+	margin:6px 0 0 5px;
 	padding:0;
 }
 
@@ -3377,7 +3421,7 @@ a:hover.search_button {
 	font-size:11px;
 	font-weight:bold;
 	text-align:left;
-	margin:0;
+	margin:-1px 0 0 0;
 	padding:0;
 }
 
@@ -3399,6 +3443,21 @@ a:hover.search_button {
 	background:url(../images/networkswitch_virtualicon.gif) no-repeat top left;
 }
 
+.networkswitch_closeicon{
+	width:12px;
+	height:12px;
+	float:left;
+	background:url(../images/search_closeicon.gif) no-repeat top left;
+	margin:-22px 0 0 10px;
+	padding:0;
+	cursor:hand;
+	cursor:pointer;
+}
+
+.networkswitch_closeicon{
+	background:url(../images/search_closeicon_hover.gif) no-repeat top left;
+}
+
 
 .networkswitch_end {
 	width:43px;
diff --git a/ui/new/jsp/iso.jsp b/ui/new/jsp/iso.jsp
index b1133d781e9..fdc2b8362b2 100644
--- a/ui/new/jsp/iso.jsp
+++ b/ui/new/jsp/iso.jsp
@@ -24,10 +24,7 @@
             <%=t.t("Details")%></div>
     </div>
     <div id="tab_content_details">
-        <div class="grid_actionpanel">
-            
-            <div class="grid_editbox" id="edit_button">
-            </div>
+        <div class="grid_actionpanel">            
             <div class="gridheader_loaderbox" id="spinning_wheel" style="border: 1px solid #999;
                 display: none;">
                 <div class="gridheader_loader" id="Div1">
diff --git a/ui/new/jsp/resource.jsp b/ui/new/jsp/resource.jsp
index 70e979d6f27..72578a0d81f 100644
--- a/ui/new/jsp/resource.jsp
+++ b/ui/new/jsp/resource.jsp
@@ -1,1188 +1,1203 @@
-<%@ page import="java.util.*" %>
-
-<%@ page import="com.cloud.utils.*" %>
-
-<%
-    Locale browserLocale = request.getLocale();
-    CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale);
-%>
-<!-- domain detail panel (begin) -->
-<div class="main_title" id="right_panel_header">
-    <!--  
-    <div class="main_titleicon">
-        <img src="images/title_snapshoticon.gif" alt="Instance" /></div>
-    -->
-    <h1 id="label">        
-    </h1>
-</div>
-<div class="contentbox" id="right_panel_content">
-    <div class="info_detailbox errorbox" id="after_action_info_container" style="display: none">
-        <p id="after_action_info">
-        </p>
-    </div>
-    <div id="zone_page" style="display:none">
-        <div class="tabbox" style="margin-top: 15px;">
-            <div class="content_tabs on" id="tab_details">
-                <%=t.t("details")%></div>
-            <div class="content_tabs off" id="tab_network">
-                <%=t.t("network")%></div>
-            <div class="content_tabs off" id="tab_secondarystorage">
-                <%=t.t("secondary.storage")%></div>
-        </div>
-        <!-- Details tab (start)-->
-        <div id="tab_content_details">        
-            <div class="grid_actionpanel">
-	            <div class="grid_actionbox" id="action_link">
-	                <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>
-	                    </ul>
-	                </div>
-	            </div>            
-	            <div class="gridheader_loaderbox" id="spinning_wheel" style="border: 1px solid #999;
-	                display: none;">
-	                <div class="gridheader_loader" id="icon">
-	                </div>
-	                <p id="description">
-	                    Waiting &hellip;</p>
-	            </div>                  
-	        </div>              
-            <div class="grid_container">
-                <div class="grid_rows odd">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("ID")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="id">
-                        </div>
-                    </div>
-                </div>
-                <div class="grid_rows even">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("name")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="name">
-                        </div>
-                    </div>
-                </div>
-                <div class="grid_rows odd">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("dns1")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="dns1">
-                        </div>
-                    </div>
-                </div>
-                <div class="grid_rows even">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("dns2")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="dns2">
-                        </div>
-                    </div>
-                </div>
-                <div class="grid_rows odd">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("internaldns1")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="internaldns1">
-                        </div>
-                    </div>
-                </div>
-                <div class="grid_rows even">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("internaldns2")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="internaldns2">
-                        </div>
-                    </div>
-                </div>
-                <div class="grid_rows odd">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("vlan")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="vlan">
-                        </div>
-                    </div>
-                </div>
-                <div class="grid_rows even">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("guestcidraddress")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="guestcidraddress">
-                        </div>
-                    </div>
-                </div>                
-            </div>
-        </div>
-        <!-- Details tab (end)-->
-        <!-- Network tab (start)-->
-        <div style="display: none;" id="tab_content_network">
-            <div class="text_container">
-                <div class="network_dgbox">
-                    <div class="networkdg_zonepanel">
-                        <div class="networkdg_zonebox">
-                            <div class="networkdg_zonecloud" id="zone_cloud">
-                                <p>
-                                    <%=t.t("zone")%> <span id="zone_name"></span></p>
-                            </div>
-                            <div class="networkdg_zoneconnect">
-                            </div>
-                        </div>
-                        <div class="networkswitchpanel">
-                            <div class="networkswitch_titlebox">
-                                <p>
-                                    Guest VLAN <span id="zone_vlan"></span></p>
-                            </div>
-                            <div class="networkswitch_top">
-                            </div>
-                            <div class="networkswitch_midpanel" id="vlan_container">                                
-                            </div>
-                            <div class="networkswitch_end">
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <!-- Network tab (end)-->
-        <!-- Secondary Storage tab (start)-->
-        <div id="tab_content_secondarystorage" style="display: none">
-            Secondary Storage
-        </div>
-        <!-- Secondary Storage tab (end)-->
-    </div>
-    <div id="pod_page" style="display:none">        
-        <div class="tabbox" style="margin-top: 15px;">
-            <div class="content_tabs on" id="tab_details">
-                <%=t.t("details")%></div>           
-        </div>
-        <!-- Details tab (start)-->
-        <div id="tab_content_details">         
-            <div class="grid_actionpanel">
-	            <div class="grid_actionbox" id="action_link">
-	                <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>
-	                    </ul>
-	                </div>
-	            </div>            
-	            <div class="gridheader_loaderbox" id="spinning_wheel" style="border: 1px solid #999;
-	                display: none;">
-	                <div class="gridheader_loader" id="icon">
-	                </div>
-	                <p id="description">
-	                    Waiting &hellip;</p>
-	            </div>                  
-	        </div>           
-            <div class="grid_container">
-                <div class="grid_rows odd">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("ID")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="id">
-                        </div>
-                    </div>
-                </div>
-                <div class="grid_rows even">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("name")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="name">
-                        </div>
-                    </div>
-                </div>
-                <div class="grid_rows odd">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("private.cidr")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="cidr">
-                        </div>
-                    </div>
-                </div>
-                <div class="grid_rows even">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("private.ip.range")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="ipRange">
-                        </div>
-                    </div>
-                </div>
-                <div class="grid_rows odd">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("gateway")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="gateway">
-                        </div>
-                    </div>
-                </div> 
-                          
-            </div>
-        </div>
-        <!-- Details tab (end)-->
-    </div>
-    <div id="cluster_page" style="display:none">
-        <div class="tabbox" style="margin-top: 15px;">
-            <div class="content_tabs on" id="tab_details">
-                <%=t.t("details")%></div>           
-        </div>
-        <!-- Details tab (start)-->
-        <div id="tab_content_details">
-            <div class="grid_container">
-                <div class="grid_rows odd">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("ID")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="id">
-                        </div>
-                    </div>
-                </div>
-                <div class="grid_rows even">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("name")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="name">
-                        </div>
-                    </div>
-                </div>
-                <div class="grid_rows odd">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("zone")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="zonename">
-                        </div>
-                    </div>
-                </div>
-                <div class="grid_rows even">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("pod")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="podname">
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <!-- Details tab (end)-->
-    </div>
-    <div id="host_page" style="display:none">
-        <div class="tabbox" style="margin-top: 15px;">
-            <div class="content_tabs on" id="tab_details">
-                <%=t.t("details")%></div>           
-        </div>
-        <!-- Details tab (start)-->
-        <div id="tab_content_details">
-            <div class="grid_actionpanel">
-	            <div class="grid_actionbox" id="action_link">
-	                <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>
-	                    </ul>
-	                </div>
-	            </div>            
-	            <div class="gridheader_loaderbox" id="spinning_wheel" style="border: 1px solid #999;
-	                display: none;">
-	                <div class="gridheader_loader" id="icon">
-	                </div>
-	                <p id="description">
-	                    Waiting &hellip;</p>
-	            </div>                  
-	        </div>        
-            <div class="grid_container">
-                <div class="grid_rows odd">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("ID")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="id">
-                        </div>
-                    </div>
-                </div>
-                <div class="grid_rows even">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("name")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="name">
-                        </div>
-                    </div>
-                </div>
-                <div class="grid_rows odd">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("state")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="state">
-                        </div>
-                    </div>
-                </div>
-                <div class="grid_rows even">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("zone")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="zonename">
-                        </div>
-                    </div>
-                </div>
-                <div class="grid_rows odd">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("pod")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="podname">
-                        </div>
-                    </div>
-                </div>
-                <div class="grid_rows even">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("cluster")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="clustername">
-                        </div>
-                    </div>
-                </div>
-                <div class="grid_rows odd">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("ip.address")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="ipaddress">
-                        </div>
-                    </div>
-                </div>
-                <div class="grid_rows even">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("version")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="version">
-                        </div>
-                    </div>
-                </div>
-                <div class="grid_rows odd">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("os.preference")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="oscategoryname">
-                        </div>
-                    </div>
-                </div>
-                <div class="grid_rows even">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("last.disconnected")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="disconnected">
-                        </div>
-                    </div>
-                </div>                
-            </div>
-        </div>
-        <!-- Details tab (end)-->
-    </div>
-    <div id="primarystorage_page" style="display:none">
-        <div class="tabbox" style="margin-top: 15px;">
-            <div class="content_tabs on" id="tab_details">
-                <%=t.t("details")%></div>           
-        </div>
-        <!-- Details tab (start)-->
-        <div id="tab_content_details">
-             <div class="grid_actionpanel">
-	            <div class="grid_actionbox" id="action_link">
-	                <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>
-	                    </ul>
-	                </div>
-	            </div>            
-	            <div class="gridheader_loaderbox" id="spinning_wheel" style="border: 1px solid #999;
-	                display: none;">
-	                <div class="gridheader_loader" id="icon">
-	                </div>
-	                <p id="description">
-	                    Waiting &hellip;</p>
-	            </div>                  
-	        </div>            
-            <div class="grid_container">
-                <div class="grid_rows odd">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("ID")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="id">
-                        </div>
-                    </div>
-                </div>
-                <div class="grid_rows even">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("name")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="name">
-                        </div>
-                    </div>
-                </div>
-                <div class="grid_rows odd">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("zone")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="zonename">
-                        </div>
-                    </div>
-                </div>
-                <div class="grid_rows even">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("pod")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="podname">
-                        </div>
-                    </div>
-                </div>
-                <div class="grid_rows odd">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("cluster")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="clustername">
-                        </div>
-                    </div>
-                </div>
-                <div class="grid_rows even">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("type")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="type">
-                        </div>
-                    </div>
-                </div>
-                <div class="grid_rows odd">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("IP.or.FQDN")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="ipaddress">
-                        </div>
-                    </div>
-                </div>
-                <div class="grid_rows even">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("path")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="path">
-                        </div>
-                    </div>
-                </div>
-                <div class="grid_rows odd">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("disk.total")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="disksizetotal">
-                        </div>
-                    </div>
-                </div>
-                <div class="grid_rows even">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("disk.allocated")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="disksizeallocated">
-                        </div>
-                    </div>
-                </div>
-                 <div class="grid_rows odd">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("tags")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="tags">
-                        </div>
-                    </div>
-                </div>                
-            </div>
-        </div>
-        <!-- Details tab (end)-->
-    </div>
-    <div id="systemvm_page" style="display:none">        
-        <div class="tabbox" style="margin-top: 15px;">
-            <div class="content_tabs on" id="tab_details">
-                <%=t.t("details")%></div>           
-        </div>
-        <!-- Details tab (start)-->
-        <div id="tab_content_details">
-            <div class="grid_container">                
-                <div class="grid_rows odd">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("state")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="state">
-                        </div>
-                    </div>
-                </div>
-                <div class="grid_rows even">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("system.vm.type")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="systemvmtype">
-                        </div>
-                    </div>
-                </div>
-                <div class="grid_rows odd">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("zone")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="zonename">
-                        </div>
-                    </div>
-                </div>
-                <div class="grid_rows even">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("ID")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="id">
-                        </div>
-                    </div>
-                </div>
-                <div class="grid_rows odd">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("name")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="name">
-                        </div>
-                    </div>
-                </div>
-                <div class="grid_rows even">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("active.sessions")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="activeviewersessions">
-                        </div>
-                    </div>
-                </div>
-                <div class="grid_rows odd">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("public.ip")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="publicip">
-                        </div>
-                    </div>
-                </div>
-                <div class="grid_rows even">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("private.ip")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="privateip">
-                        </div>
-                    </div>
-                </div>
-                <div class="grid_rows odd">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("host")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="hostname">
-                        </div>
-                    </div>
-                </div>
-                <div class="grid_rows even">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("gateway")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="gateway">
-                        </div>
-                    </div>
-                </div>
-                <div class="grid_rows odd">
-                    <div class="grid_row_cell" style="width: 20%;">
-                        <div class="row_celltitles">
-                            <%=t.t("created")%>:</div>
-                    </div>
-                    <div class="grid_row_cell" style="width: 79%;">
-                        <div class="row_celltitles" id="created">
-                        </div>
-                    </div>
-                </div>
-                          
-            </div>
-        </div>
-        <!-- Details tab (end)-->
-    </div>    
-</div>
-<!-- domain detail panel (end) -->
-
-<!-- Add Zone Dialog -->
-<div id="dialog_add_zone" title="Add Zone" style="display:none">
-	<p>Please enter the following info to add a new zone:</p>
-	<div class="dialog_formcontent">
-		<form action="#" method="post" id="form_acquire">
-			<ol>
-				<li>
-					<label>Name:</label>
-					<input class="text" type="text" name="add_zone_name" id="add_zone_name"/>
-					<div id="add_zone_name_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
-				</li>
-				<li>
-					<label>DNS 1:</label>
-					<input class="text" type="text" name="add_zone_dns1" id="add_zone_dns1"/>
-					<div id="add_zone_dns1_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
-				</li>
-				<li>
-					<label>DNS 2:</label>
-					<input class="text" type="text" name="add_zone_dns2" id="add_zone_dns2"/>
-					<div id="add_zone_dns2_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
-				</li>
-				<li>
-					<label>Internal DNS 1:</label>
-					<input class="text" type="text" id="add_zone_internaldns1"/>
-					<div id="add_zone_internaldns1_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
-				</li>
-				<li>
-					<label>Internal DNS 2:</label>
-					<input class="text" type="text" id="add_zone_internaldns2"/>
-					<div id="add_zone_internaldns2_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
-				</li>
-				<li id="add_zone_container">
-					<label>Zone VLAN Range:</label>
-					<input class="text" style="width:67px" type="text" name="add_zone_startvlan" id="add_zone_startvlan"/><span>-</span>
-                    <input class="text" style="width:67px" type="text" name="add_zone_endvlan" id="add_zone_endvlan"/>
-					<div id="add_zone_startvlan_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
-					<div id="add_zone_endvlan_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
-				</li>
-				<li>
-					<label for="add_zone_guestcidraddress">Guest CIDR:</label>
-					<input class="text" type="text" id="add_zone_guestcidraddress" value="10.1.1.0/24"/>
-					<div id="add_zone_guestcidraddress_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
-				</li>
-			</ol>
-		</form>
-	</div>
-</div>
-<!-- END Add Zone Dialog -->
-<!-- Add Pod Dialog -->
-<div id="dialog_add_pod" title="Add Pod" style="display:none">
-	<p>Add a new pod for zone <b><span id="add_pod_zone_name"></span></b> </p>
-	<div class="dialog_formcontent">
-		<form action="#" method="post" id="form_acquire">
-			<ol>
-				<li>
-					<label for="user_name" style="width:115px;">Name:</label>
-					<input class="text" type="text" name="add_pod_name" id="add_pod_name"/>
-					<div id="add_pod_name_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
-				</li>
-				<li>
-					<label for="add_pod_gateway" style="width:115px;">Gateway:</label>
-					<input class="text" type="text" id="add_pod_gateway"/>
-					<div id="add_pod_gateway_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
-				</li>
-				<li>
-					<label for="user_name" style="width:115px;">CIDR:</label>
-					<input class="text" type="text" name="add_pod_cidr" id="add_pod_cidr"/>
-					<div id="add_pod_cidr_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
-				</li>
-				<li>
-					<label for="user_name" style="width:115px;">Private IP Range:</label>
-					<input class="text" style="width:67px" type="text" name="add_pod_startip" id="add_pod_startip"/><span>-</span>
-                    <input class="text" style="width:67px" type="text" name="add_pod_endip" id="add_pod_endip"/>
-					<div id="add_pod_startip_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
-					<div id="add_pod_endip_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
-				</li>				
-			</ol>
-		</form>
-	</div>
-</div>
-<!-- END Add Pod Dialog -->
-
-<!-- Add Host Dialog -->
-<div id="dialog_add_host" title="Add Host" style="display:none">
-	<p>Add a host for zone <b><span id="zone_name"></span></b>, pod <b><span id="pod_name"></span></b></p>
-	<div class="dialog_formcontent">
-		<form action="#" method="post" id="form_acquire">
-			<ol>				
-				<li>
-					<label for="host_hostname">Host name:</label>
-					<input class="text" type="text" name="host_hostname" id="host_hostname"/>
-					<div id="host_hostname_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
-				</li>
-				<li>
-					<label for="user_name">User name:</label>
-					<input class="text" type="text" name="host_username" id="host_username"/>
-					<div id="host_username_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
-				</li>
-				<li>
-					<label for="user_name">Password:</label>
-					<input class="text" type="password" name="host_password" id="host_password" AUTOCOMPLETE="off" />
-					<div id="host_password_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
-				</li>
-				<li id="cluster_options_container">
-				    <label>&nbsp;</label><span><u>Cluster Options</u></span>
-				</li>
-				<li id="new_cluster_radio_container">
-				    <label><input type="radio" name="cluster" value="new_cluster_radio" checked />&nbsp;New cluster:</label>
-				    <input class="text" type="text" id="new_cluster_name"/>
-					<div id="new_cluster_name_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
-				</li>
-				<li id="existing_cluster_radio_container">
-				    <label><input type="radio" name="cluster" value="existing_cluster_radio" />&nbsp;Join cluster:</label>
-				    <select class="select" id="cluster_select"></select>
-				</li>
-				<li id="no_cluster_radio_container">
-				    <label><input type="radio" name="cluster" value="no_cluster_radio" />&nbsp;Standalone</label>
-				    <span style="padding-left:20px"></span>
-				</li>
-			</ol>
-		</form>
-	</div>
-</div>
-
-<!-- Add Primary Storage Dialog -->
-<div id="dialog_add_pool" title="Add Primary Storage" style="display: none">
-    <p>Add a new Primary Storage for zone <b><span id="zone_name"></span></b>, pod <b><span id="pod_name"></span></b></p>
-    <div class="dialog_formcontent">
-        <form action="#" method="post" id="form_acquire">
-        <ol>            
-            <li id="pool_cluster_container">
-                <label for="pool_cluster">
-                    Cluster:</label>
-                <select class="select" id="pool_cluster">                    
-                </select>
-                <div id="pool_cluster_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
-                </div>
-            </li>
-            <li>
-                <label for="user_name">Name:</label>
-                <input class="text" type="text" name="add_pool_name" id="add_pool_name" />
-                <div id="add_pool_name_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
-                </div>
-            </li>
-            <li>
-                <label for="add_pool_protocol">Protocol:</label>
-				<select class="select" id="add_pool_protocol">
-                    <option value="nfs">NFS</option>
-					<option value="iscsi">ISCSI</option>
-                </select>
-			</li>
-			<li>
-				<label for="add_pool_nfs_server">Server:</label>
-                <input class="text" type="text" name="add_pool_nfs_server" id="add_pool_nfs_server" />
-                <div id="add_pool_nfs_server_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
-                </div>
-            </li>
-            <li id="add_pool_path_container">
-                <label for="add_pool_path">
-                    Path:</label>
-                <input class="text" type="text" name="add_pool_path" id="add_pool_path" />
-                <div id="add_pool_path_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
-                </div>
-            </li>            
-			<li id="add_pool_iqn_container" style="display:none">
-                <label for="add_pool_iqn">
-                    Target IQN:</label>
-                <input class="text" type="text" name="add_pool_iqn" id="add_pool_iqn" />
-                <div id="add_pool_iqn_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
-                </div>
-            </li>
-			<li id="add_pool_lun_container" style="display:none">
-                <label for="add_pool_lun">
-                    LUN #:</label>
-                <input class="text" type="text" name="add_pool_lun" id="add_pool_lun" />
-                <div id="add_pool_lun_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
-                </div>
-            </li>
-            <li id="add_pool_tags_container">
-                <label for="add_pool_tags">
-                    Tags:</label>
-                <input class="text" type="text" id="add_pool_tags" />
-                <div id="add_pool_tags_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
-                </div>
-            </li>
-        </ol>
-        </form>
-    </div>
-</div>
-
-<!-- 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></p>
-    <div class="dialog_formcontent">
-        <form action="#" method="post" id="form1">
-        <ol>            
-            <li>
-                <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>
-                <input class="text" type="text" name="path" id="path" />
-                <div id="path_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
-                </div>
-            </li>
-        </ol>
-        </form>
-    </div>
-</div>
-<!-- Add Secondary Storage Dialog (end) -->
-
-<!-- Add VLAN IP Range Dialog for zone (begin) -->
-<div id="dialog_add_vlan_for_zone" title="Add VLAN IP Range" style="display:none">
-	<p>Add a new IP range for zone: <b><span id="zone_name"></span></b></p>
-	<div class="dialog_formcontent">
-		<form action="#" method="post" id="form_acquire">
-			<ol>
-				<li style="display:none" id="add_publicip_vlan_type_container">
-					<label for="add_publicip_vlan_type">Type:</label>
-					<select class="select" name="add_publicip_vlan_type" id="add_publicip_vlan_type">
-					    <option value="false">direct</option>
-						<option value="true">public</option>						
-					</select>
-				</li>
-				<li id="add_publicip_vlan_container">
-					<label for="add_publicip_vlan_tagged">VLAN:</label>
-					<select class="select" name="add_publicip_vlan_tagged" id="add_publicip_vlan_tagged">
-					</select>
-				</li>
-				<li style="display:none" id="add_publicip_vlan_vlan_container">
-					<label for="user_name">VLAN ID:</label>
-					<input class="text" type="text" name="add_publicip_vlan_vlan" id="add_publicip_vlan_vlan"/>
-					<div id="add_publicip_vlan_vlan_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
-				</li>
-				<li id="add_publicip_vlan_scope_container">
-					<label for="add_publicip_vlan_scope">Scope:</label>
-					<select class="select" name="add_publicip_vlan_scope" id="add_publicip_vlan_scope">
-					    <option value="zone-wide">zone-wide</option>
-						<option value="account-specific">account-specific</option>						
-					</select>
-				</li>
-				<li style="display:none" id="add_publicip_vlan_pod_container">
-					<label for="user_name">Pod:</label>
-					<select class="select" name="add_publicip_vlan_pod" id="add_publicip_vlan_pod">					
-					</select>
-				</li>
-				<li style="display:none" id="add_publicip_vlan_domain_container">
-					<label for="user_name">Domain:</label>
-					<select class="select" name="add_publicip_vlan_domain" id="add_publicip_vlan_domain">					
-					</select>
-				</li>
-				<li style="display:none" id="add_publicip_vlan_account_container">
-					<label for="user_name">Account:</label>
-					<input class="text" type="text" name="add_publicip_vlan_account" id="add_publicip_vlan_account"/>
-					<div id="add_publicip_vlan_account_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
-				</li>
-				<li>
-					<label for="user_name">Gateway:</label>
-					<input class="text" type="text" name="add_publicip_vlan_gateway" id="add_publicip_vlan_gateway"/>
-					<div id="add_publicip_vlan_gateway_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
-				</li>
-				<li>
-					<label for="user_name">Netmask:</label>
-					<input class="text" type="text" name="add_publicip_vlan_netmask" id="add_publicip_vlan_netmask"/>
-					<div id="add_publicip_vlan_netmask_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
-				</li>
-				<li>
-					<label for="user_name">IP Range:</label>
-					<input class="text" style="width:67px" type="text" name="add_publicip_vlan_startip" id="add_publicip_vlan_startip"/><span>-</span>
-                    <input class="text" style="width:67px" type="text" name="add_publicip_vlan_endip" id="add_publicip_vlan_endip"/>
-					<div id="add_publicip_vlan_startip_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
-					<div id="add_publicip_vlan_endip_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
-				</li>
-			</ol>
-		</form>
-	</div>
-</div>
-<!-- Add VLAN IP Range Dialog for zone (end) -->
-
-
-<!-- Direct VLAN Template (begin) -->
-<div class="networkswitch_vlanpanel" id="direct_vlan_template" style="display: none">
-    <div class="networkswitch_vlanconnect">
-        <div class="networkswitch_vlan_infoicon">
-        </div>
-        <div class="networkswitch_vlan_detailsbox">
-            <div class="networkswitch_vlan_detailsbox_textbox">
-                <div class="networkswitch_vlan_detailsbox_textbox_label">
-                    VLAN:</div>
-                <span id="vlan_id">n</span>
-            </div>
-            <div class="networkswitch_vlan_detailsbox_textbox">
-                <div class="networkswitch_vlan_detailsbox_textbox_label">
-                    <%=t.t("ip.address.range")%>:</div>
-                <span id="ip_range">n.n.n.n - m.m.m.m</span>
-            </div>
-        </div>
-        <div class="networkswitch_typeicon direct">
-        </div>
-    </div>
-</div>
-<!-- Direct VLAN Template (end) -->
-<!-- Public VLAN Template (begin) -->
-<div class="networkswitch_vlanpanel" id="virtual_vlan_template" style="display: none">
-    <div class="networkswitch_vlanconnect">
-        <div class="networkswitch_vlan_infoicon">
-        </div>
-        <div class="networkswitch_vlan_detailsbox">
-            <div class="networkswitch_vlan_detailsbox_textbox">
-                <div class="networkswitch_vlan_detailsbox_textbox_label">
-                    VLAN:</div>
-                <span id="vlan_id">n</span>
-            </div>
-            <div class="networkswitch_vlan_detailsbox_textbox">
-                <div class="networkswitch_vlan_detailsbox_textbox_label">
-                     <%=t.t("ip.address.range")%>:</div>
-                <span id="ip_range">n.n.n.n - m.m.m.m</span>
-            </div>
-        </div>
-        <div class="networkswitch_typeicon virtual">
-        </div>
-    </div>
-</div>
-<!-- Public VLAN Template (begin) -->
-
-
-<!--  secondary storage tab template (begin) -->
-<div class="grid_container" id="secondary_storage_tab_template" style="display: none">
-    <div class="grid_header">
-        <div class="grid_header_title" id="title">
-        </div>
-        <div class="grid_actionbox" id="secondarystorage_action_link">
-            <div class="grid_actionsdropdown_box" id="secondarystorage_action_menu" style="display: none;">
-                <ul class="actionsdropdown_boxlist" id="action_list">
-                </ul>
-            </div>
-        </div>
-        <div class="gridheader_loaderbox" id="spinning_wheel" style="display: none; height: 18px;">
-            <div class="gridheader_loader" id="icon">
-            </div>
-            <p id="description">
-                Waiting &hellip;
-            </p>
-        </div>       
-    </div>
-    
-    <div class="grid_rows" id="after_action_info_container" style="display:none">
-        <div class="grid_row_cell" style="width: 90%; border: none;">
-            <div class="row_celltitles">
-                <strong id="after_action_info">Message will appear here</strong></div>
-        </div>
-    </div>
-        
-    <div class="grid_rows even">
-        <div class="grid_row_cell" style="width: 20%;">
-            <div class="row_celltitles">
-                ID:</div>
-        </div>
-        <div class="grid_row_cell" style="width: 79%;">
-            <div class="row_celltitles" id="id">
-            </div>
-        </div>
-    </div>
-    <div class="grid_rows odd">
-        <div class="grid_row_cell" style="width: 20%;">
-            <div class="row_celltitles">
-                Name:</div>
-        </div>
-        <div class="grid_row_cell" style="width: 79%;">
-            <div class="row_celltitles" id="name">
-            </div>
-        </div>
-    </div>
-    <div class="grid_rows even">
-        <div class="grid_row_cell" style="width: 20%;">
-            <div class="row_celltitles">
-                <%=t.t("zone")%>:</div>
-        </div>
-        <div class="grid_row_cell" style="width: 79%;">
-            <div class="row_celltitles" id="zonename">
-            </div>
-        </div>
-    </div>
-    <div class="grid_rows odd">
-        <div class="grid_row_cell" style="width: 20%;">
-            <div class="row_celltitles">
-                <%=t.t("type")%>:</div>
-        </div>
-        <div class="grid_row_cell" style="width: 79%;">
-            <div class="row_celltitles" id="type">
-            </div>
-        </div>
-    </div>
-    <div class="grid_rows even">
-        <div class="grid_row_cell" style="width: 20%;">
-            <div class="row_celltitles">
-                <%=t.t("ip.address")%>:</div>
-        </div>
-        <div class="grid_row_cell" style="width: 79%;">
-            <div class="row_celltitles" id="ipaddress">
-            </div>
-        </div>
-    </div>
-    <div class="grid_rows odd">
-        <div class="grid_row_cell" style="width: 20%;">
-            <div class="row_celltitles">
-                <%=t.t("state")%>:</div>
-        </div>
-        <div class="grid_row_cell" style="width: 79%;">
-            <div class="row_celltitles" id="state">
-            </div>
-        </div>
-    </div>
-    <div class="grid_rows even">
-        <div class="grid_row_cell" style="width: 20%;">
-            <div class="row_celltitles">
-                <%=t.t("version")%>:</div>
-        </div>
-        <div class="grid_row_cell" style="width: 79%;">
-            <div class="row_celltitles" id="version">
-            </div>
-        </div>
-    </div>
-    <div class="grid_rows odd">
-        <div class="grid_row_cell" style="width: 20%;">
-            <div class="row_celltitles">
-                <%=t.t("last.disconnected")%>:</div>
-        </div>
-        <div class="grid_row_cell" style="width: 79%;">
-            <div class="row_celltitles" id="disconnected">
-            </div>
-        </div>
-    </div>    
-</div>
-<!--  secondary storage tab template (end) -->
-
-<!-- dialogs -->
-<div id="dialog_confirmation_enable_maintenance" title="Confirmation" style="display: none">
-    <p>        
-        <%=t.t("enabling.maintenance.mode.will.cause.a.live.migration.of.all.running.instances.on.this.host.to.any.available.host")%>
-    </p>
-</div>
-
-<div id="dialog_confirmation_cancel_maintenance" title="Confirmation" style="display: none">
-    <p>                
-        <%=t.t("please.confirm.you.want.to.cancel.maintenance.for.the.host")%>
-    </p>
-</div>
-
-<div id="dialog_confirmation_force_reconnect" title="Confirmation" style="display: none">
-    <p>                 
-        <%=t.t("please.confirm.you.want.to.force.a.reconnection.for.the.host")%>
-    </p>
-</div>
-
-<div id="dialog_confirmation_remove_host" title="Confirmation" style="display: none">
-    <p>                         
-        <%=t.t("please.confirm.you.want.to.remove.the.host.from.the.management.server")%>
-    </p>
-</div>
-
-<!-- Update OS Pref Dialog -->
-<div id="dialog_update_os" title="Update OS Preference" style="display:none">
-	<p>	    
-	    <%=t.t("Please.choose.a.OS.preference.for.this.host..Virtual.machines.will.always.be.allocated.to.hosts.with.an.OS.preference.that.matches.with.the.OS.type.of.the.template.chosen.for.the.virtual.machine.before.choosing.other.hosts.")%>
-	</p>
-	<div class="dialog_formcontent">
-		<form action="#" method="post" id="form_acquire">
-			<ol>
-				<li>
-					<label><%=t.t("OS.preference")%>:</label>
-					<select class="select" name="host_os" id="host_os">
-						<option value=""><%=t.t("none")%></option>
-					</select>
-				</li>
-			</ol>
-		</form>
-	</div>
-</div>
-
-<div id="dialog_confirmation_delete_primarystorage" title="Confirmation" style="display: none">
-    <p>                         
-        <%=t.t("please.confirm.you.want.to.delete.the.primary.storage")%>
-    </p>
-</div>
-
-<div id="dialog_confirmation_delete_secondarystorage" title="Confirmation" style="display: none">
-    <p>                         
-        <%=t.t("please.confirm.you.want.to.delete.the.secondary.storage")%>
-    </p>
-</div>
+<%@ page import="java.util.*" %>
+
+<%@ page import="com.cloud.utils.*" %>
+
+<%
+    Locale browserLocale = request.getLocale();
+    CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale);
+%>
+<!-- domain detail panel (begin) -->
+<div class="main_title" id="right_panel_header">
+    <!--  
+    <div class="main_titleicon">
+        <img src="images/title_snapshoticon.gif" alt="Instance" /></div>
+    -->
+    <h1 id="label">        
+    </h1>
+</div>
+<div class="contentbox" id="right_panel_content">
+    <div class="info_detailbox errorbox" id="after_action_info_container" style="display: none">
+        <p id="after_action_info">
+        </p>
+    </div>
+    <div id="zone_page" style="display:none">
+        <div class="tabbox" style="margin-top: 15px;">
+            <div class="content_tabs on" id="tab_details">
+                <%=t.t("details")%></div>
+            <div class="content_tabs off" id="tab_network">
+                <%=t.t("network")%></div>
+            <div class="content_tabs off" id="tab_secondarystorage">
+                <%=t.t("secondary.storage")%></div>
+        </div>
+        <!-- Details tab (start)-->
+        <div id="tab_content_details">        
+            <div class="grid_actionpanel">
+	                        
+	            <div class="gridheader_loaderbox" id="spinning_wheel" style="border: 1px solid #999;
+	                display: none;">
+	                <div class="gridheader_loader" id="icon">
+	                </div>
+	                <p id="description">
+	                    Waiting &hellip;</p>
+	            </div>                  
+	        </div>              
+            <div class="grid_container">
+            	<div class="grid_header">
+                    <div class="grid_header_title">Title</div>
+                    <div class="grid_actionbox" id="action_link">
+	                <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>
+	                    </ul>
+	                </div>
+	            </div>
+                </div>
+                <div class="grid_rows odd">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("ID")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="id">
+                        </div>
+                    </div>
+                </div>
+                <div class="grid_rows even">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("name")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="name">
+                        </div>
+                    </div>
+                </div>
+                <div class="grid_rows odd">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("dns1")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="dns1">
+                        </div>
+                    </div>
+                </div>
+                <div class="grid_rows even">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("dns2")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="dns2">
+                        </div>
+                    </div>
+                </div>
+                <div class="grid_rows odd">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("internaldns1")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="internaldns1">
+                        </div>
+                    </div>
+                </div>
+                <div class="grid_rows even">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("internaldns2")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="internaldns2">
+                        </div>
+                    </div>
+                </div>
+                <div class="grid_rows odd">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("vlan")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="vlan">
+                        </div>
+                    </div>
+                </div>
+                <div class="grid_rows even">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("guestcidraddress")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="guestcidraddress">
+                        </div>
+                    </div>
+                </div>                
+            </div>
+        </div>
+        <!-- Details tab (end)-->
+        <!-- Network tab (start)-->
+        <div style="display: none;" id="tab_content_network">
+            <div class="text_container">
+                <div class="network_dgbox">
+                    <div class="networkdg_zonepanel">
+                        <div class="networkdg_zonebox">
+                            <div class="networkdg_zonecloud" id="zone_cloud">
+                                <p>
+                                    <%=t.t("zone")%> <span id="zone_name"></span></p>
+                            </div>
+                            <div class="networkdg_zoneconnect">
+                            </div>
+                        </div>
+                        <div class="networkswitchpanel">
+                            <div class="networkswitch_titlebox">
+                                <p>
+                                   <strong> Guest VLAN:  <span id="zone_vlan"></span></strong></p>
+                            </div>
+                            <div class="networkswitch_top">
+                            </div>
+                            <div class="networkswitch_midpanel" id="vlan_container">                                
+                            </div>
+                            <div class="networkswitch_end">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <!-- Network tab (end)-->
+        <!-- Secondary Storage tab (start)-->
+        <div id="tab_content_secondarystorage" style="display: none">
+            Secondary Storage
+        </div>
+        <!-- Secondary Storage tab (end)-->
+    </div>
+    <div id="pod_page" style="display:none">        
+        <div class="tabbox" style="margin-top: 15px;">
+            <div class="content_tabs on" id="tab_details">
+                <%=t.t("details")%></div>           
+        </div>
+        <!-- Details tab (start)-->
+        <div id="tab_content_details">         
+            <div class="grid_actionpanel">
+	            <div class="grid_actionbox" id="action_link">
+	                <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>
+	                    </ul>
+	                </div>
+	            </div>            
+	            <div class="gridheader_loaderbox" id="spinning_wheel" style="border: 1px solid #999;
+	                display: none;">
+	                <div class="gridheader_loader" id="icon">
+	                </div>
+	                <p id="description">
+	                    Waiting &hellip;</p>
+	            </div>                  
+	        </div>           
+            <div class="grid_container">
+                <div class="grid_rows odd">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("ID")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="id">
+                        </div>
+                    </div>
+                </div>
+                <div class="grid_rows even">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("name")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="name">
+                        </div>
+                    </div>
+                </div>
+                <div class="grid_rows odd">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("private.cidr")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="cidr">
+                        </div>
+                    </div>
+                </div>
+                <div class="grid_rows even">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("private.ip.range")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="ipRange">
+                        </div>
+                    </div>
+                </div>
+                <div class="grid_rows odd">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("gateway")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="gateway">
+                        </div>
+                    </div>
+                </div> 
+                          
+            </div>
+        </div>
+        <!-- Details tab (end)-->
+    </div>
+    <div id="cluster_page" style="display:none">
+        <div class="tabbox" style="margin-top: 15px;">
+            <div class="content_tabs on" id="tab_details">
+                <%=t.t("details")%></div>           
+        </div>
+        <!-- Details tab (start)-->
+        <div id="tab_content_details">
+            <div class="grid_container">
+                <div class="grid_rows odd">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("ID")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="id">
+                        </div>
+                    </div>
+                </div>
+                <div class="grid_rows even">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("name")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="name">
+                        </div>
+                    </div>
+                </div>
+                <div class="grid_rows odd">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("zone")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="zonename">
+                        </div>
+                    </div>
+                </div>
+                <div class="grid_rows even">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("pod")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="podname">
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <!-- Details tab (end)-->
+    </div>
+    <div id="host_page" style="display:none">
+        <div class="tabbox" style="margin-top: 15px;">
+            <div class="content_tabs on" id="tab_details">
+                <%=t.t("details")%></div>           
+        </div>
+        <!-- Details tab (start)-->
+        <div id="tab_content_details">
+            <div class="grid_actionpanel">
+	            <div class="grid_actionbox" id="action_link">
+	                <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>
+	                    </ul>
+	                </div>
+	            </div>            
+	            <div class="gridheader_loaderbox" id="spinning_wheel" style="border: 1px solid #999;
+	                display: none;">
+	                <div class="gridheader_loader" id="icon">
+	                </div>
+	                <p id="description">
+	                    Waiting &hellip;</p>
+	            </div>                  
+	        </div>        
+            <div class="grid_container">
+                <div class="grid_rows odd">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("ID")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="id">
+                        </div>
+                    </div>
+                </div>
+                <div class="grid_rows even">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("name")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="name">
+                        </div>
+                    </div>
+                </div>
+                <div class="grid_rows odd">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("state")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="state">
+                        </div>
+                    </div>
+                </div>
+                <div class="grid_rows even">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("zone")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="zonename">
+                        </div>
+                    </div>
+                </div>
+                <div class="grid_rows odd">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("pod")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="podname">
+                        </div>
+                    </div>
+                </div>
+                <div class="grid_rows even">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("cluster")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="clustername">
+                        </div>
+                    </div>
+                </div>
+                <div class="grid_rows odd">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("ip.address")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="ipaddress">
+                        </div>
+                    </div>
+                </div>
+                <div class="grid_rows even">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("version")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="version">
+                        </div>
+                    </div>
+                </div>
+                <div class="grid_rows odd">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("os.preference")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="oscategoryname">
+                        </div>
+                    </div>
+                </div>
+                <div class="grid_rows even">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("last.disconnected")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="disconnected">
+                        </div>
+                    </div>
+                </div>                
+            </div>
+        </div>
+        <!-- Details tab (end)-->
+    </div>
+    <div id="primarystorage_page" style="display:none">
+        <div class="tabbox" style="margin-top: 15px;">
+            <div class="content_tabs on" id="tab_details">
+                <%=t.t("details")%></div>           
+        </div>
+        <!-- Details tab (start)-->
+        <div id="tab_content_details">
+             <div class="grid_actionpanel">
+	            <div class="grid_actionbox" id="action_link">
+	                <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>
+	                    </ul>
+	                </div>
+	            </div>            
+	            <div class="gridheader_loaderbox" id="spinning_wheel" style="border: 1px solid #999;
+	                display: none;">
+	                <div class="gridheader_loader" id="icon">
+	                </div>
+	                <p id="description">
+	                    Waiting &hellip;</p>
+	            </div>                  
+	        </div>            
+            <div class="grid_container">
+                <div class="grid_rows odd">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("ID")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="id">
+                        </div>
+                    </div>
+                </div>
+                <div class="grid_rows even">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("name")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="name">
+                        </div>
+                    </div>
+                </div>
+                <div class="grid_rows odd">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("zone")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="zonename">
+                        </div>
+                    </div>
+                </div>
+                <div class="grid_rows even">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("pod")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="podname">
+                        </div>
+                    </div>
+                </div>
+                <div class="grid_rows odd">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("cluster")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="clustername">
+                        </div>
+                    </div>
+                </div>
+                <div class="grid_rows even">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("type")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="type">
+                        </div>
+                    </div>
+                </div>
+                <div class="grid_rows odd">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("IP.or.FQDN")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="ipaddress">
+                        </div>
+                    </div>
+                </div>
+                <div class="grid_rows even">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("path")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="path">
+                        </div>
+                    </div>
+                </div>
+                <div class="grid_rows odd">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("disk.total")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="disksizetotal">
+                        </div>
+                    </div>
+                </div>
+                <div class="grid_rows even">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("disk.allocated")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="disksizeallocated">
+                        </div>
+                    </div>
+                </div>
+                 <div class="grid_rows odd">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("tags")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="tags">
+                        </div>
+                    </div>
+                </div>                
+            </div>
+        </div>
+        <!-- Details tab (end)-->
+    </div>
+    <div id="systemvm_page" style="display:none">        
+        <div class="tabbox" style="margin-top: 15px;">
+            <div class="content_tabs on" id="tab_details">
+                <%=t.t("details")%></div>           
+        </div>
+        <!-- Details tab (start)-->
+        <div id="tab_content_details">
+            <div class="grid_container">                
+                <div class="grid_rows odd">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("state")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="state">
+                        </div>
+                    </div>
+                </div>
+                <div class="grid_rows even">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("system.vm.type")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="systemvmtype">
+                        </div>
+                    </div>
+                </div>
+                <div class="grid_rows odd">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("zone")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="zonename">
+                        </div>
+                    </div>
+                </div>
+                <div class="grid_rows even">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("ID")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="id">
+                        </div>
+                    </div>
+                </div>
+                <div class="grid_rows odd">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("name")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="name">
+                        </div>
+                    </div>
+                </div>
+                <div class="grid_rows even">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("active.sessions")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="activeviewersessions">
+                        </div>
+                    </div>
+                </div>
+                <div class="grid_rows odd">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("public.ip")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="publicip">
+                        </div>
+                    </div>
+                </div>
+                <div class="grid_rows even">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("private.ip")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="privateip">
+                        </div>
+                    </div>
+                </div>
+                <div class="grid_rows odd">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("host")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="hostname">
+                        </div>
+                    </div>
+                </div>
+                <div class="grid_rows even">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("gateway")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="gateway">
+                        </div>
+                    </div>
+                </div>
+                <div class="grid_rows odd">
+                    <div class="grid_row_cell" style="width: 20%;">
+                        <div class="row_celltitles">
+                            <%=t.t("created")%>:</div>
+                    </div>
+                    <div class="grid_row_cell" style="width: 79%;">
+                        <div class="row_celltitles" id="created">
+                        </div>
+                    </div>
+                </div>
+                          
+            </div>
+        </div>
+        <!-- Details tab (end)-->
+    </div>    
+</div>
+<!-- domain detail panel (end) -->
+
+<!-- Add Zone Dialog -->
+<div id="dialog_add_zone" title="Add Zone" style="display:none">
+	<p>Please enter the following info to add a new zone:</p>
+	<div class="dialog_formcontent">
+		<form action="#" method="post" id="form_acquire">
+			<ol>
+				<li>
+					<label>Name:</label>
+					<input class="text" type="text" name="add_zone_name" id="add_zone_name"/>
+					<div id="add_zone_name_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
+				</li>
+				<li>
+					<label>DNS 1:</label>
+					<input class="text" type="text" name="add_zone_dns1" id="add_zone_dns1"/>
+					<div id="add_zone_dns1_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
+				</li>
+				<li>
+					<label>DNS 2:</label>
+					<input class="text" type="text" name="add_zone_dns2" id="add_zone_dns2"/>
+					<div id="add_zone_dns2_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
+				</li>
+				<li>
+					<label>Internal DNS 1:</label>
+					<input class="text" type="text" id="add_zone_internaldns1"/>
+					<div id="add_zone_internaldns1_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
+				</li>
+				<li>
+					<label>Internal DNS 2:</label>
+					<input class="text" type="text" id="add_zone_internaldns2"/>
+					<div id="add_zone_internaldns2_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
+				</li>
+				<li id="add_zone_container">
+					<label>Zone VLAN Range:</label>
+					<input class="text" style="width:67px" type="text" name="add_zone_startvlan" id="add_zone_startvlan"/><span>-</span>
+                    <input class="text" style="width:67px" type="text" name="add_zone_endvlan" id="add_zone_endvlan"/>
+					<div id="add_zone_startvlan_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
+					<div id="add_zone_endvlan_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
+				</li>
+				<li>
+					<label for="add_zone_guestcidraddress">Guest CIDR:</label>
+					<input class="text" type="text" id="add_zone_guestcidraddress" value="10.1.1.0/24"/>
+					<div id="add_zone_guestcidraddress_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
+				</li>
+			</ol>
+		</form>
+	</div>
+</div>
+<!-- END Add Zone Dialog -->
+<!-- Add Pod Dialog -->
+<div id="dialog_add_pod" title="Add Pod" style="display:none">
+	<p>Add a new pod for zone <b><span id="add_pod_zone_name"></span></b> </p>
+	<div class="dialog_formcontent">
+		<form action="#" method="post" id="form_acquire">
+			<ol>
+				<li>
+					<label for="user_name" style="width:115px;">Name:</label>
+					<input class="text" type="text" name="add_pod_name" id="add_pod_name"/>
+					<div id="add_pod_name_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
+				</li>
+				<li>
+					<label for="add_pod_gateway" style="width:115px;">Gateway:</label>
+					<input class="text" type="text" id="add_pod_gateway"/>
+					<div id="add_pod_gateway_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
+				</li>
+				<li>
+					<label for="user_name" style="width:115px;">CIDR:</label>
+					<input class="text" type="text" name="add_pod_cidr" id="add_pod_cidr"/>
+					<div id="add_pod_cidr_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
+				</li>
+				<li>
+					<label for="user_name" style="width:115px;">Private IP Range:</label>
+					<input class="text" style="width:67px" type="text" name="add_pod_startip" id="add_pod_startip"/><span>-</span>
+                    <input class="text" style="width:67px" type="text" name="add_pod_endip" id="add_pod_endip"/>
+					<div id="add_pod_startip_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
+					<div id="add_pod_endip_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
+				</li>				
+			</ol>
+		</form>
+	</div>
+</div>
+<!-- END Add Pod Dialog -->
+
+<!-- Add Host Dialog -->
+<div id="dialog_add_host" title="Add Host" style="display:none">
+	<p>Add a host for zone <b><span id="zone_name"></span></b>, pod <b><span id="pod_name"></span></b></p>
+	<div class="dialog_formcontent">
+		<form action="#" method="post" id="form_acquire">
+			<ol>				
+				<li>
+					<label for="host_hostname">Host name:</label>
+					<input class="text" type="text" name="host_hostname" id="host_hostname"/>
+					<div id="host_hostname_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
+				</li>
+				<li>
+					<label for="user_name">User name:</label>
+					<input class="text" type="text" name="host_username" id="host_username"/>
+					<div id="host_username_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
+				</li>
+				<li>
+					<label for="user_name">Password:</label>
+					<input class="text" type="password" name="host_password" id="host_password" AUTOCOMPLETE="off" />
+					<div id="host_password_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
+				</li>
+				<li id="cluster_options_container">
+				    <label>&nbsp;</label><span><u>Cluster Options</u></span>
+				</li>
+				<li id="new_cluster_radio_container">
+				    <label><input type="radio" name="cluster" value="new_cluster_radio" checked />&nbsp;New cluster:</label>
+				    <input class="text" type="text" id="new_cluster_name"/>
+					<div id="new_cluster_name_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
+				</li>
+				<li id="existing_cluster_radio_container">
+				    <label><input type="radio" name="cluster" value="existing_cluster_radio" />&nbsp;Join cluster:</label>
+				    <select class="select" id="cluster_select"></select>
+				</li>
+				<li id="no_cluster_radio_container">
+				    <label><input type="radio" name="cluster" value="no_cluster_radio" />&nbsp;Standalone</label>
+				    <span style="padding-left:20px"></span>
+				</li>
+			</ol>
+		</form>
+	</div>
+</div>
+
+<!-- Add Primary Storage Dialog -->
+<div id="dialog_add_pool" title="Add Primary Storage" style="display: none">
+    <p>Add a new Primary Storage for zone <b><span id="zone_name"></span></b>, pod <b><span id="pod_name"></span></b></p>
+    <div class="dialog_formcontent">
+        <form action="#" method="post" id="form_acquire">
+        <ol>            
+            <li id="pool_cluster_container">
+                <label for="pool_cluster">
+                    Cluster:</label>
+                <select class="select" id="pool_cluster">                    
+                </select>
+                <div id="pool_cluster_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                </div>
+            </li>
+            <li>
+                <label for="user_name">Name:</label>
+                <input class="text" type="text" name="add_pool_name" id="add_pool_name" />
+                <div id="add_pool_name_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                </div>
+            </li>
+            <li>
+                <label for="add_pool_protocol">Protocol:</label>
+				<select class="select" id="add_pool_protocol">
+                    <option value="nfs">NFS</option>
+					<option value="iscsi">ISCSI</option>
+                </select>
+			</li>
+			<li>
+				<label for="add_pool_nfs_server">Server:</label>
+                <input class="text" type="text" name="add_pool_nfs_server" id="add_pool_nfs_server" />
+                <div id="add_pool_nfs_server_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                </div>
+            </li>
+            <li id="add_pool_path_container">
+                <label for="add_pool_path">
+                    Path:</label>
+                <input class="text" type="text" name="add_pool_path" id="add_pool_path" />
+                <div id="add_pool_path_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                </div>
+            </li>            
+			<li id="add_pool_iqn_container" style="display:none">
+                <label for="add_pool_iqn">
+                    Target IQN:</label>
+                <input class="text" type="text" name="add_pool_iqn" id="add_pool_iqn" />
+                <div id="add_pool_iqn_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                </div>
+            </li>
+			<li id="add_pool_lun_container" style="display:none">
+                <label for="add_pool_lun">
+                    LUN #:</label>
+                <input class="text" type="text" name="add_pool_lun" id="add_pool_lun" />
+                <div id="add_pool_lun_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                </div>
+            </li>
+            <li id="add_pool_tags_container">
+                <label for="add_pool_tags">
+                    Tags:</label>
+                <input class="text" type="text" id="add_pool_tags" />
+                <div id="add_pool_tags_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                </div>
+            </li>
+        </ol>
+        </form>
+    </div>
+</div>
+
+<!-- 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></p>
+    <div class="dialog_formcontent">
+        <form action="#" method="post" id="form1">
+        <ol>            
+            <li>
+                <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>
+                <input class="text" type="text" name="path" id="path" />
+                <div id="path_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                </div>
+            </li>
+        </ol>
+        </form>
+    </div>
+</div>
+<!-- Add Secondary Storage Dialog (end) -->
+
+<!-- Add VLAN IP Range Dialog for zone (begin) -->
+<div id="dialog_add_vlan_for_zone" title="Add VLAN IP Range" style="display:none">
+	<p>Add a new IP range for zone: <b><span id="zone_name"></span></b></p>
+	<div class="dialog_formcontent">
+		<form action="#" method="post" id="form_acquire">
+			<ol>
+				<li style="display:none" id="add_publicip_vlan_type_container">
+					<label for="add_publicip_vlan_type">Type:</label>
+					<select class="select" name="add_publicip_vlan_type" id="add_publicip_vlan_type">
+					    <option value="false">direct</option>
+						<option value="true">public</option>						
+					</select>
+				</li>
+				<li id="add_publicip_vlan_container">
+					<label for="add_publicip_vlan_tagged">VLAN:</label>
+					<select class="select" name="add_publicip_vlan_tagged" id="add_publicip_vlan_tagged">
+					</select>
+				</li>
+				<li style="display:none" id="add_publicip_vlan_vlan_container">
+					<label for="user_name">VLAN ID:</label>
+					<input class="text" type="text" name="add_publicip_vlan_vlan" id="add_publicip_vlan_vlan"/>
+					<div id="add_publicip_vlan_vlan_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
+				</li>
+				<li id="add_publicip_vlan_scope_container">
+					<label for="add_publicip_vlan_scope">Scope:</label>
+					<select class="select" name="add_publicip_vlan_scope" id="add_publicip_vlan_scope">
+					    <option value="zone-wide">zone-wide</option>
+						<option value="account-specific">account-specific</option>						
+					</select>
+				</li>
+				<li style="display:none" id="add_publicip_vlan_pod_container">
+					<label for="user_name">Pod:</label>
+					<select class="select" name="add_publicip_vlan_pod" id="add_publicip_vlan_pod">					
+					</select>
+				</li>
+				<li style="display:none" id="add_publicip_vlan_domain_container">
+					<label for="user_name">Domain:</label>
+					<select class="select" name="add_publicip_vlan_domain" id="add_publicip_vlan_domain">					
+					</select>
+				</li>
+				<li style="display:none" id="add_publicip_vlan_account_container">
+					<label for="user_name">Account:</label>
+					<input class="text" type="text" name="add_publicip_vlan_account" id="add_publicip_vlan_account"/>
+					<div id="add_publicip_vlan_account_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
+				</li>
+				<li>
+					<label for="user_name">Gateway:</label>
+					<input class="text" type="text" name="add_publicip_vlan_gateway" id="add_publicip_vlan_gateway"/>
+					<div id="add_publicip_vlan_gateway_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
+				</li>
+				<li>
+					<label for="user_name">Netmask:</label>
+					<input class="text" type="text" name="add_publicip_vlan_netmask" id="add_publicip_vlan_netmask"/>
+					<div id="add_publicip_vlan_netmask_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
+				</li>
+				<li>
+					<label for="user_name">IP Range:</label>
+					<input class="text" style="width:67px" type="text" name="add_publicip_vlan_startip" id="add_publicip_vlan_startip"/><span>-</span>
+                    <input class="text" style="width:67px" type="text" name="add_publicip_vlan_endip" id="add_publicip_vlan_endip"/>
+					<div id="add_publicip_vlan_startip_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
+					<div id="add_publicip_vlan_endip_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
+				</li>
+			</ol>
+		</form>
+	</div>
+</div>
+<!-- Add VLAN IP Range Dialog for zone (end) -->
+
+
+<!-- Direct VLAN Template (begin) -->
+<div class="networkswitch_vlanpanel" id="direct_vlan_template" style="display: none;">
+    <div class="networkswitch_vlanconnect">
+        <div class="networkswitch_vlan_infoicon">
+        	
+        </div>
+        <div class="networkswitch_infodropdown" style="display:none;">
+        	<ul class="networkswitch_infodropdown_textbox">
+            	<li><div class="networkswitch_infodropdown_textbox_label">Zone</div>: NC </li>
+                <li><div class="networkswitch_infodropdown_textbox_label">Network Type</div>: Root</li>
+                <li><div class="networkswitch_infodropdown_textbox_label">Account</div>: Admin</li>
+            </ul>
+        </div>
+        
+        <div class="networkswitch_vlan_detailsbox">
+            <div class="networkswitch_vlan_detailsbox_textbox">
+                <div class="networkswitch_vlan_detailsbox_textbox_label">
+                    VLAN:</div>
+                <span id="vlan_id">n</span>
+            </div>
+            <div class="networkswitch_vlan_detailsbox_textbox">
+                <div class="networkswitch_vlan_detailsbox_textbox_label">
+                    <%=t.t("ip.address.range")%>:</div>
+                <span id="ip_range">n.n.n.n - m.m.m.m</span>
+            </div>
+        </div>
+        <div class="networkswitch_typeicon direct">
+        </div>
+        
+       
+    </div>
+</div>
+<!-- Direct VLAN Template (end) -->
+<!-- Public VLAN Template (begin) -->
+<div class="networkswitch_vlanpanel" id="virtual_vlan_template" style="display: none">
+    <div class="networkswitch_vlanconnect">
+        <div class="networkswitch_vlan_infoicon">
+        </div>
+        <div class="networkswitch_vlan_detailsbox">
+            <div class="networkswitch_vlan_detailsbox_textbox">
+                <div class="networkswitch_vlan_detailsbox_textbox_label">
+                    VLAN:</div>
+                <span id="vlan_id">n</span>
+            </div>
+            <div class="networkswitch_vlan_detailsbox_textbox">
+                <div class="networkswitch_vlan_detailsbox_textbox_label">
+                     <%=t.t("ip.address.range")%>:</div>
+                <span id="ip_range">n.n.n.n - m.m.m.m</span>
+            </div>
+        </div>
+        <div class="networkswitch_typeicon virtual">
+        </div>
+    </div>
+</div>
+<!-- Public VLAN Template (begin) -->
+
+
+<!--  secondary storage tab template (begin) -->
+<div class="grid_container" id="secondary_storage_tab_template" style="display: none">
+    <div class="grid_header">
+        <div class="grid_header_title" id="title">
+        </div>
+        <div class="grid_actionbox" id="secondarystorage_action_link">
+            <div class="grid_actionsdropdown_box" id="secondarystorage_action_menu" style="display: none;">
+                <ul class="actionsdropdown_boxlist" id="action_list">
+                </ul>
+            </div>
+        </div>
+        <div class="gridheader_loaderbox" id="spinning_wheel" style="display: none; height: 18px;">
+            <div class="gridheader_loader" id="icon">
+            </div>
+            <p id="description">
+                Waiting &hellip;
+            </p>
+        </div>       
+    </div>
+    
+    <div class="grid_rows" id="after_action_info_container" style="display:none">
+        <div class="grid_row_cell" style="width: 90%; border: none;">
+            <div class="row_celltitles">
+                <strong id="after_action_info">Message will appear here</strong></div>
+        </div>
+    </div>
+        
+    <div class="grid_rows even">
+        <div class="grid_row_cell" style="width: 20%;">
+            <div class="row_celltitles">
+                ID:</div>
+        </div>
+        <div class="grid_row_cell" style="width: 79%;">
+            <div class="row_celltitles" id="id">
+            </div>
+        </div>
+    </div>
+    <div class="grid_rows odd">
+        <div class="grid_row_cell" style="width: 20%;">
+            <div class="row_celltitles">
+                Name:</div>
+        </div>
+        <div class="grid_row_cell" style="width: 79%;">
+            <div class="row_celltitles" id="name">
+            </div>
+        </div>
+    </div>
+    <div class="grid_rows even">
+        <div class="grid_row_cell" style="width: 20%;">
+            <div class="row_celltitles">
+                <%=t.t("zone")%>:</div>
+        </div>
+        <div class="grid_row_cell" style="width: 79%;">
+            <div class="row_celltitles" id="zonename">
+            </div>
+        </div>
+    </div>
+    <div class="grid_rows odd">
+        <div class="grid_row_cell" style="width: 20%;">
+            <div class="row_celltitles">
+                <%=t.t("type")%>:</div>
+        </div>
+        <div class="grid_row_cell" style="width: 79%;">
+            <div class="row_celltitles" id="type">
+            </div>
+        </div>
+    </div>
+    <div class="grid_rows even">
+        <div class="grid_row_cell" style="width: 20%;">
+            <div class="row_celltitles">
+                <%=t.t("ip.address")%>:</div>
+        </div>
+        <div class="grid_row_cell" style="width: 79%;">
+            <div class="row_celltitles" id="ipaddress">
+            </div>
+        </div>
+    </div>
+    <div class="grid_rows odd">
+        <div class="grid_row_cell" style="width: 20%;">
+            <div class="row_celltitles">
+                <%=t.t("state")%>:</div>
+        </div>
+        <div class="grid_row_cell" style="width: 79%;">
+            <div class="row_celltitles" id="state">
+            </div>
+        </div>
+    </div>
+    <div class="grid_rows even">
+        <div class="grid_row_cell" style="width: 20%;">
+            <div class="row_celltitles">
+                <%=t.t("version")%>:</div>
+        </div>
+        <div class="grid_row_cell" style="width: 79%;">
+            <div class="row_celltitles" id="version">
+            </div>
+        </div>
+    </div>
+    <div class="grid_rows odd">
+        <div class="grid_row_cell" style="width: 20%;">
+            <div class="row_celltitles">
+                <%=t.t("last.disconnected")%>:</div>
+        </div>
+        <div class="grid_row_cell" style="width: 79%;">
+            <div class="row_celltitles" id="disconnected">
+            </div>
+        </div>
+    </div>    
+</div>
+<!--  secondary storage tab template (end) -->
+
+<!-- dialogs -->
+<div id="dialog_confirmation_enable_maintenance" title="Confirmation" style="display: none">
+    <p>        
+        <%=t.t("enabling.maintenance.mode.will.cause.a.live.migration.of.all.running.instances.on.this.host.to.any.available.host")%>
+    </p>
+</div>
+
+<div id="dialog_confirmation_cancel_maintenance" title="Confirmation" style="display: none">
+    <p>                
+        <%=t.t("please.confirm.you.want.to.cancel.maintenance.for.the.host")%>
+    </p>
+</div>
+
+<div id="dialog_confirmation_force_reconnect" title="Confirmation" style="display: none">
+    <p>                 
+        <%=t.t("please.confirm.you.want.to.force.a.reconnection.for.the.host")%>
+    </p>
+</div>
+
+<div id="dialog_confirmation_remove_host" title="Confirmation" style="display: none">
+    <p>                         
+        <%=t.t("please.confirm.you.want.to.remove.the.host.from.the.management.server")%>
+    </p>
+</div>
+
+<!-- Update OS Pref Dialog -->
+<div id="dialog_update_os" title="Update OS Preference" style="display:none">
+	<p>	    
+	    <%=t.t("Please.choose.a.OS.preference.for.this.host..Virtual.machines.will.always.be.allocated.to.hosts.with.an.OS.preference.that.matches.with.the.OS.type.of.the.template.chosen.for.the.virtual.machine.before.choosing.other.hosts.")%>
+	</p>
+	<div class="dialog_formcontent">
+		<form action="#" method="post" id="form_acquire">
+			<ol>
+				<li>
+					<label><%=t.t("OS.preference")%>:</label>
+					<select class="select" name="host_os" id="host_os">
+						<option value=""><%=t.t("none")%></option>
+					</select>
+				</li>
+			</ol>
+		</form>
+	</div>
+</div>
+
+<div id="dialog_confirmation_delete_primarystorage" title="Confirmation" style="display: none">
+    <p>                         
+        <%=t.t("please.confirm.you.want.to.delete.the.primary.storage")%>
+    </p>
+</div>
+
+<div id="dialog_confirmation_delete_secondarystorage" title="Confirmation" style="display: none">
+    <p>                         
+        <%=t.t("please.confirm.you.want.to.delete.the.secondary.storage")%>
+    </p>
+</div>
diff --git a/ui/new/scripts/cloud.core2.iso.js b/ui/new/scripts/cloud.core2.iso.js
index ede54a28d72..e7ffe19082a 100644
--- a/ui/new/scripts/cloud.core2.iso.js
+++ b/ui/new/scripts/cloud.core2.iso.js
@@ -84,11 +84,6 @@ function afterLoadIsoJSP() {
         return false;
     });
     
-    //edit button ***
-    var $readonlyFields  = $detailsTab.find("#name, #displaytext");
-    var $editFields = $detailsTab.find("#name_edit, #displaytext_edit"); 
-    initializeEditFunction($readonlyFields, $editFields, doUpdateIso); 
-       
     //populate dropdown ***
     var addIsoZoneField = $("#dialog_add_iso #add_iso_zone");    	
 	if (isAdmin())  
@@ -219,10 +214,11 @@ function isoJsonToDetailsTab(jsonObj) {
     
     // "Edit", "Copy", "Create VM" 
 	if ((isUser() && jsonObj.ispublic == "true" && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account)) || jsonObj.isready == "false") {		
-		$("#edit_button").hide();
+		//$("#edit_button").hide();
     }
     else {        
-        $("#edit_button").show();
+        buildActionLinkForDetailsTab("Edit ISO", isoActionMap, $actionMenu, midmenuId);		
+        //$("#edit_button").show();
         buildActionLinkForDetailsTab("Copy ISO", isoActionMap, $actionMenu, midmenuId);		
         noAvailableActions = false;
     }
@@ -274,6 +270,9 @@ function isoClearDetailsTab() {
 }
 
 var isoActionMap = {  
+    "Edit ISO": {
+        dialogBeforeActionFn : doEditISO  
+    },
     "Delete ISO": {                  
         isAsyncJob: true,
         asyncJobResponse: "deleteisosresponse",
@@ -303,7 +302,31 @@ var isoActionMap = {
     }  
 }   
 
-function doUpdateIso() { 
+function doEditISO() {   
+    var $detailsTab = $("#right_panel_content #tab_content_details");  
+    var $readonlyFields  = $detailsTab.find("#name, #displaytext");
+    var $editFields = $detailsTab.find("#name_edit, #displaytext_edit"); 
+           
+    $readonlyFields.hide();
+    $editFields.show();  
+    $detailsTab.find("#cancel_button, #save_button").show();
+    
+    $detailsTab.find("#cancel_button").unbind("click").bind("click", function(event){    
+        $editFields.hide();
+        $readonlyFields.show();   
+        $("#save_button, #cancel_button").hide();       
+        return false;
+    });
+    $detailsTab.find("#save_button").unbind("click").bind("click", function(event){        
+        doEditISO2($detailsTab);     
+        $editFields.hide();      
+        $readonlyFields.show();       
+        $("#save_button, #cancel_button").hide();       
+        return false;
+    });   
+}
+
+function doEditISO2($detailsTab) { 
     var $detailsTab = $("#right_panel_content #tab_content_details");      
     
     // validate values
diff --git a/ui/new/scripts/cloud.core2.template.js b/ui/new/scripts/cloud.core2.template.js
index b5b1f881e0a..60156687361 100644
--- a/ui/new/scripts/cloud.core2.template.js
+++ b/ui/new/scripts/cloud.core2.template.js
@@ -280,7 +280,6 @@ function templateJsonToDetailsTab(jsonObj) {
     
     // action Edit, Copy, Create VM 			
 	if ((isUser() && jsonObj.ispublic == "true" && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account)) || jsonObj.id==DomRTemplateId || jsonObj.isready == "false") {
-		//template.find("#template_edit_container, #template_copy_container, #template_create_vm_container").hide(); 
 		//$("#edit_button").hide();		
     }
     else {