diff --git a/client/WEB-INF/classes/resources/resource.properties b/client/WEB-INF/classes/resources/resource.properties
index b65212e5771..2dab056acab 100644
--- a/client/WEB-INF/classes/resources/resource.properties
+++ b/client/WEB-INF/classes/resources/resource.properties
@@ -64,6 +64,15 @@ value = Value
 description = Description
 category = Category
 hypervisor = Hypervisor
+dns1 = DNS 1
+dns2 = DNS 2
+internaldns1 = Internal DNS 1
+internaldns2 = Internal DNS 2
+vlan = VLAN
+guestcidraddress = Guest CIDR
+private.cidr = Private CIDR
+private.ip.range = Private IP Range
+gateway = Gateway
 
 disk.offering = Disk Offering
 copy.ISO.to = Copy ISO to
diff --git a/ui/new/css/main.css b/ui/new/css/main.css
index 239ce943856..243a8643439 100644
--- a/ui/new/css/main.css
+++ b/ui/new/css/main.css
@@ -1258,7 +1258,27 @@ a:visited {
 	margin:0;
 	padding:0;
 	border-bottom:1px dashed #92a7b7;
-	
+}
+
+.leftmenu_expandedbox{
+	width:220px;
+	height:auto;
+	float:left;
+	background:#7f9bae url(../images/leftmenu_expanded.gif) repeat-x top left;
+	border-bottom:1px solid #FFF;
+	margin:0;
+	padding:0;
+	overflow-x:scoll;
+	overflow-x:auto;
+	overflow-y:hidden;
+}
+
+.leftmenu_expandedlist{
+	width:100%;
+	height:auto;
+	float:left; 
+	margin:0;
+	padding:0;
 }
 
 .leftmenu_content{
@@ -1275,11 +1295,17 @@ a:visited {
 	padding:0 0 3px 0;
 }
 
+				
+
 .leftmenu_content.selected{
 	color:#FFF;
 	background:#626262 url(../images/leftmenu_hover.gif) repeat-x top left;
 }
 
+.leftmenu_content.highlighted{
+	background:#a9b8c3 url(../images/leftmenu_highlighted.gif) repeat-x top left;
+}
+
 /*
 .leftmenu_content:hover{
 	background:#626262 url(../images/leftmenu_hover.gif) repeat-x top left;
@@ -1296,7 +1322,8 @@ a:visited {
 }
 
 .leftmenu_firstindent{
-	width:200px;
+	min-width:200px;
+	max-width:auto;
 	height:auto;
 	float:left;
 	margin:7px 0 0 10px;
@@ -1305,32 +1332,70 @@ a:visited {
 }
 
 .leftmenu_secondindent{
-	width:180px;
+	min-width:180px;
+	max-width:auto;
 	height:auto;
 	float:left;
-	margin:7px 0 0 25px;
+	color:#FFF;
+	margin:7px 0 0 30px;
 	display:inline;
 	padding:0;
 }
 
 .leftmenu_thirdindent{
-	width:150px;
+	min-width:160px;
+	max-width:auto;
 	height:auto;
 	float:left;
-	margin:7px 0 0 60px;
+	color:#FFF;
+	margin:7px 0 0 50px;
 	display:inline;
 	padding:0;
 }
 
 .leftmenu_fourthindent{
-	width:170px;
+	min-width:200px;
+	max-width:auto;
 	height:auto;
 	float:left;
+	color:#FFF;
+	margin:7px 0 0 70px;
+	display:inline;
+	padding:0;
+}
+
+.leftmenu_fifthindent{
+	min-width:200px;
+	max-width:auto;
+	height:auto;
+	float:left;
+	color:#FFF;
 	margin:7px 0 0 100px;
 	display:inline;
 	padding:0;
 }
 
+.leftmenu_sixthindent{
+	min-width:200px;
+	max-width:auto;
+	height:auto;
+	float:left;
+	color:#FFF;
+	margin:7px 0 0 120px;
+	display:inline;
+	padding:0;
+}
+
+.leftmenu_domainindent{
+	min-width:180px;
+	max-width:auto;
+	height:auto;
+	float:left;
+	color:#FFF;
+	margin:7px 0 0 30px;
+	display:inline;
+	padding:0;
+}
 
 .leftmenu_titles {
 	width:auto;
@@ -1355,10 +1420,10 @@ a:visited {
 
 
 .leftmenu_arrows {
-	width:10px;
-	height:11px;
+	width:9px;
+	height:9px;
 	float:left;
-	margin:2px 6px 0 0;
+	margin:2px 4px 0 0;
 	padding:0;
 }
 
@@ -1366,10 +1431,26 @@ a:visited {
 	background:url(../images/leftmenu_closedarrow.png) no-repeat top left;
 }
 
+.leftmenu_arrows.nonexpanded_close {
+	background:url(../images/leftmenu_closedarrow_nonexp.png) no-repeat top left;
+}
+
 .leftmenu_arrows.open {
 	background:url(../images/leftmenu_openarrow.png) no-repeat top left;
 }
 
+.leftmenu_arrows.expanded_close {
+	background:url(../images/leftmenu_white_closedarrow.png) no-repeat top left;
+}
+
+.leftmenu_arrows.white_nonexpanded_close {
+	background:url(../images/leftmenu_white_closedarrow_nonexp.png) no-repeat top left;
+}
+
+.leftmenu_arrows.expanded_open {
+	background:url(../images/leftmenu_white_openedarrow.png) no-repeat top left;
+}
+
 .right_panel {
 	width:auto;
 	height:auto;
@@ -2837,8 +2918,14 @@ a:hover.search_button {
 	width:auto;
 	height:auto;
 	float:left;
-	margin:0 0 0 0;
-	padding:0;
+	color:#FFF;
+	text-align:left;
+	font-weight:normal;
+	font-size:11px;
+	cursor:pointer;
+	cursor:hand;
+	margin:0;
+	padding:0 0 3px 0;
 }
 
 
diff --git a/ui/new/images/alert_leftmenuicon.png b/ui/new/images/alert_leftmenuicon.png
new file mode 100644
index 00000000000..9e5b604712a
Binary files /dev/null and b/ui/new/images/alert_leftmenuicon.png differ
diff --git a/ui/new/images/destroyvm_actionicon.png b/ui/new/images/destroyvm_actionicon.png
new file mode 100644
index 00000000000..d868d0931e2
Binary files /dev/null and b/ui/new/images/destroyvm_actionicon.png differ
diff --git a/ui/new/images/leftmenu_closedarrow.png b/ui/new/images/leftmenu_closedarrow.png
index 1d3e81c9c2b..5271e23aa1d 100644
Binary files a/ui/new/images/leftmenu_closedarrow.png and b/ui/new/images/leftmenu_closedarrow.png differ
diff --git a/ui/new/images/leftmenu_closedarrow_nonexp.png b/ui/new/images/leftmenu_closedarrow_nonexp.png
new file mode 100644
index 00000000000..f5c90940560
Binary files /dev/null and b/ui/new/images/leftmenu_closedarrow_nonexp.png differ
diff --git a/ui/new/images/leftmenu_expanded.gif b/ui/new/images/leftmenu_expanded.gif
new file mode 100644
index 00000000000..59b4f616a01
Binary files /dev/null and b/ui/new/images/leftmenu_expanded.gif differ
diff --git a/ui/new/images/leftmenu_highlighted.gif b/ui/new/images/leftmenu_highlighted.gif
new file mode 100644
index 00000000000..c2570849ad7
Binary files /dev/null and b/ui/new/images/leftmenu_highlighted.gif differ
diff --git a/ui/new/images/leftmenu_openarrow.png b/ui/new/images/leftmenu_openarrow.png
index 0725bf4368b..132f7d34bce 100644
Binary files a/ui/new/images/leftmenu_openarrow.png and b/ui/new/images/leftmenu_openarrow.png differ
diff --git a/ui/new/images/leftmenu_white_closedarrow.png b/ui/new/images/leftmenu_white_closedarrow.png
new file mode 100644
index 00000000000..04f806a46ec
Binary files /dev/null and b/ui/new/images/leftmenu_white_closedarrow.png differ
diff --git a/ui/new/images/leftmenu_white_closedarrow_nonexp.png b/ui/new/images/leftmenu_white_closedarrow_nonexp.png
new file mode 100644
index 00000000000..ed7fb0b8e4a
Binary files /dev/null and b/ui/new/images/leftmenu_white_closedarrow_nonexp.png differ
diff --git a/ui/new/images/leftmenu_white_openedarrow.png b/ui/new/images/leftmenu_white_openedarrow.png
new file mode 100644
index 00000000000..45f1f5e5e1d
Binary files /dev/null and b/ui/new/images/leftmenu_white_openedarrow.png differ
diff --git a/ui/new/images/rebootvm_actionicon.png b/ui/new/images/rebootvm_actionicon.png
new file mode 100644
index 00000000000..d6057448a78
Binary files /dev/null and b/ui/new/images/rebootvm_actionicon.png differ
diff --git a/ui/new/images/startvm_actionicon.png b/ui/new/images/startvm_actionicon.png
new file mode 100644
index 00000000000..1a585a3dc99
Binary files /dev/null and b/ui/new/images/startvm_actionicon.png differ
diff --git a/ui/new/images/stopvm_actionicon.png b/ui/new/images/stopvm_actionicon.png
new file mode 100644
index 00000000000..34d0399def1
Binary files /dev/null and b/ui/new/images/stopvm_actionicon.png differ
diff --git a/ui/new/images/zone_zoneicon.png b/ui/new/images/zone_zoneicon.png
index 93b1fb26889..4799285102d 100644
Binary files a/ui/new/images/zone_zoneicon.png and b/ui/new/images/zone_zoneicon.png differ
diff --git a/ui/new/index.jsp b/ui/new/index.jsp
index 11e7ec48099..1f7b7feb7a8 100644
--- a/ui/new/index.jsp
+++ b/ui/new/index.jsp
@@ -176,7 +176,7 @@ long milliseconds = new Date().getTime();
                                 </ul>
                             </div>
                         </div>
-                        <div class="actionpanel_button_wrapper" id="midmenu_add_link" style="display: none">
+                        <div class="actionpanel_button_wrapper" id="midmenu_add_link" style="display: none;">
                             <div class="actionpanel_button">
                                 <div class="actionpanel_button_icons">
                                     <img src="images/addvm_actionicon.png" alt="Add" /></div>
@@ -185,6 +185,41 @@ long milliseconds = new Date().getTime();
                             </div>
                         </div>
                         
+                        <div class="actionpanel_button_wrapper" id="midmenu_add_link" style="display: none;">
+                            <div class="actionpanel_button">
+                                <div class="actionpanel_button_icons">
+                                    <img src="images/startvm_actionicon.png" alt="Start" /></div>
+                                <div class="actionpanel_button_links">
+                                    Start</div>
+                            </div>
+                        </div>
+                        
+                        <div class="actionpanel_button_wrapper" id="midmenu_add_link" style="display: none;">
+                            <div class="actionpanel_button">
+                                <div class="actionpanel_button_icons">
+                                    <img src="images/stopvm_actionicon.png" alt="Stop" /></div>
+                                <div class="actionpanel_button_links">
+                                    Stop</div>
+                            </div>
+                        </div>
+                        
+                        <div class="actionpanel_button_wrapper" id="midmenu_add_link" style="display: none;">
+                            <div class="actionpanel_button">
+                                <div class="actionpanel_button_icons">
+                                    <img src="images/rebootvm_actionicon.png" alt="Reboot" /></div>
+                                <div class="actionpanel_button_links">
+                                    Reboot</div>
+                            </div>
+                        </div>
+                        
+                         <div class="actionpanel_button_wrapper" id="midmenu_add_link" style="display: none;">
+                            <div class="actionpanel_button">
+                                <div class="actionpanel_button_icons">
+                                    <img src="images/destroyvm_actionicon.png" alt="Destroy" /></div>
+                                <div class="actionpanel_button_links">
+                                    Destroy</div>
+                            </div>
+                        </div>
                         <div class="actionpanel_button_wrapper" id="add_link" style="display: block; float:right; background:none; ">
                             <div class="actionpanel_button">
                                 <div class="actionpanel_button_icons">
@@ -219,9 +254,9 @@ long milliseconds = new Date().getTime();
         <div class="leftmenu_panel">
             <div class="leftmenu_box" id="accordion_menu" style="display: none">
                 <div class="leftmenu_list">
-                    <div class="leftmenu_content">
+                    <div class="leftmenu_content" id="leftmenu_dashboard">
                         <div class="leftmenu_firstindent">
-                            <div class="leftmenu_arrows close" id="arrowIcon">
+                            <div class="leftmenu_arrows nonexpanded_close" id="arrowIcon">
                             </div>
                             <div class="leftmenu_list_icons">
                                 <img src="images/leftmenu_dashboardicon.png" alt="Dashboard" /></div>
@@ -229,17 +264,9 @@ long milliseconds = new Date().getTime();
                         </div>
                     </div>
                 </div>
+                
                 <div class="leftmenu_list">
-                    <div class="leftmenu_content" id="leftmenu_dashboard">
-                        <div class="leftmenu_secondindent">
-                            <div class="leftmenu_list_icons">
-                                <img src="images/leftmenu_dashboardicon.png" alt="Dashboard" /></div>
-                            <%=t.t("dashboard")%>
-                        </div>
-                    </div>
-                </div>
-                <div class="leftmenu_list">
-                    <div class="leftmenu_content">
+                    <div class="leftmenu_content highlighted">
                         <div class="leftmenu_firstindent">
                             <div class="leftmenu_arrows close" id="arrowIcon">
                             </div>
@@ -248,29 +275,36 @@ long milliseconds = new Date().getTime();
                             <%=t.t("instance")%>
                         </div>
                     </div>
-                </div>
-                <div class="leftmenu_list">
-                    <div id="leftmenu_instance_group">
-                        <div class="leftmenu_content" id="leftmenu_instance_group_header">
-                            <div class="leftmenu_secondindent">
-                                <div class="leftmenu_arrows close" id="arrow_icon">
+                    <div class="leftmenu_expandedbox">
+                    	<div id="leftmenu_instance_group">
+                        	<div class="leftmenu_expandedlist">
+                                <div class="leftmenu_content" id="leftmenu_instance_group_header">
+                                    <div class="leftmenu_secondindent">
+                                        <div class="leftmenu_arrows expanded_close" id="arrow_icon">
+                                        </div>
+                                        <div class="leftmenu_list_icons">
+                                            <img src="images/instance_leftmenuicon.png" alt="Instance" /></div>
+                                        <%=t.t("instance")%>
+                                    </div>
                                 </div>
-                                <div class="leftmenu_list_icons">
-                                    <img src="images/instance_leftmenuicon.png" alt="Instance" /></div>
-                                <%=t.t("instance")%>
+                               </div>
+                            <div id="leftmenu_instance_group_container">
                             </div>
                         </div>
-                        <div id="leftmenu_instance_group_container">
-                        </div>
+                        <div class="leftmenu_expandedlist">
+                            <div class="leftmenu_content" id="leftmenu_router">
+                                <div class="leftmenu_secondindent">
+                                	 <div class="leftmenu_arrows white_nonexpanded_close" id="arrow_icon">
+                                     </div>                          
+                                    <div class="leftmenu_list_icons">
+                                        <img src="images/routers_leftmenuicon.png" alt="Router" /></div>
+                                    <%=t.t("router")%>
+                                </div>
+                            </div>
+                    	</div>
                     </div>
-                    <div class="leftmenu_content" id="leftmenu_router">
-                        <div class="leftmenu_secondindent">                           
-                            <div class="leftmenu_list_icons">
-                                <img src="images/routers_leftmenuicon.png" alt="Router" /></div>
-                            <%=t.t("router")%>
-                        </div>
-                    </div>                   
-                </div>               
+                </div>
+                               
                 <div class="leftmenu_list">
                     <div class="leftmenu_content">
                         <div class="leftmenu_firstindent">
@@ -281,25 +315,35 @@ long milliseconds = new Date().getTime();
                             <%=t.t("storage")%>
                         </div>
                     </div>
-                </div>
-                <div class="leftmenu_list">                   
-                    <div class="leftmenu_content" id="leftmenu_volume">
-                        <div class="leftmenu_secondindent">
-                            <div class="leftmenu_list_icons">
-                                <img src="images/leftmenu_volumeicon.png" alt="Volume" /></div>
-                            <%=t.t("volume")%>
-                        </div>
-                    </div>
-                    <div class="leftmenu_content" id="leftmenu_snapshot">
-                        <div class="leftmenu_secondindent">
-                            <div class="leftmenu_list_icons">
-                                <img src="images/leftmenu_snapshotsicon.png" alt="Snapshot" /></div>
-                            <%=t.t("snapshot")%>
+                    <div class="leftmenu_expandedbox">
+                    	<div class="leftmenu_expandedlist">
+                    		<div class="leftmenu_content" id="leftmenu_volume">
+                                <div class="leftmenu_secondindent">
+                                	<div class="leftmenu_arrows white_nonexpanded_close" id="arrow_icon">
+                                     </div>
+                                    <div class="leftmenu_list_icons">
+                                        <img src="images/leftmenu_volumeicon.png" alt="Volume" /></div>
+                                    <%=t.t("volume")%>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="leftmenu_expandedlist">
+                        	<div class="leftmenu_content" id="leftmenu_snapshot">
+                                <div class="leftmenu_secondindent">
+                                	<div class="leftmenu_arrows white_nonexpanded_close" id="arrow_icon">
+                                     </div>
+                                    <div class="leftmenu_list_icons">
+                                        <img src="images/leftmenu_snapshotsicon.png" alt="Snapshot" /></div>
+                                    <%=t.t("snapshot")%>
+                                </div>
+                            </div>
                         </div>
                     </div>
+                    
                 </div>
+                
                 <div class="leftmenu_list">
-                    <div class="leftmenu_content">
+                    <div class="leftmenu_content" id="leftmenu_ip">
                         <div class="leftmenu_firstindent">
                             <div class="leftmenu_arrows close" id="arrowIcon">
                             </div>
@@ -309,15 +353,7 @@ long milliseconds = new Date().getTime();
                         </div>
                     </div>
                 </div>
-                <div class="leftmenu_list">
-                    <div class="leftmenu_content" id="leftmenu_ip">
-                        <div class="leftmenu_secondindent">
-                            <div class="leftmenu_list_icons">
-                                <img src="images/leftmenu_ipaddressicon.png" alt="IP Address" /></div>
-                            <%=t.t("ip.address")%>
-                        </div>
-                    </div>                    
-                </div>
+                
                 <div class="leftmenu_list">
                     <div class="leftmenu_content">
                         <div class="leftmenu_firstindent">
@@ -330,117 +366,152 @@ long milliseconds = new Date().getTime();
                     </div>
                 </div>
                 <div class="leftmenu_list">
-                    <div id="leftmenu_itemplate_filter">    
-                        <div class="leftmenu_content" id="leftmenu_template_filter_header">
-                            <div class="leftmenu_secondindent">                                
-                                <div class="leftmenu_list_icons">
-                                    <img src="images/templates_leftmenuicon.png" alt="Template" /></div>
-                                 <%=t.t("template")%>
+                  <div class="leftmenu_expandedbox">    
+                        <div id="leftmenu_itemplate_filter">    
+                            <div class="leftmenu_content" id="leftmenu_template_filter_header">
+                                <div class="leftmenu_secondindent"> 
+                                	<div class="leftmenu_arrows expanded_open" id="arrowIcon">
+                            		</div>                               
+                                    <div class="leftmenu_list_icons">
+                                        <img src="images/templates_leftmenuicon.png" alt="Template" /></div>
+                                     <%=t.t("template")%>
+                                </div>
                             </div>
-                        </div>
-                        <div id="leftmenu_template_filter_container">                        
-                            <div class="leftmenu_content" id="leftmenu_submenu_my_template">
-						        <div class="leftmenu_thirdindent">
-						            <div class="leftmenu_list_icons">
-						                <img src="images/templates_leftmenuicon.png" alt="My Template" /></div>
-						            <div>
-						                 <%=t.t("my.template")%></div>
-						        </div>
-						    </div>                        
-                            <div class="leftmenu_content" id="leftmenu_submenu_featured_template">
-						        <div class="leftmenu_thirdindent">
-						            <div class="leftmenu_list_icons">
-						                <img src="images/templates_leftmenuicon.png" alt="Featured Template" /></div>
-						            <div>
-						                 <%=t.t("featured.template")%></div>
-						        </div>
-						    </div>                        
-                            <div class="leftmenu_content" id="leftmenu_submenu_community_template">
-						        <div class="leftmenu_thirdindent">
-						            <div class="leftmenu_list_icons">
-						                <img src="images/templates_leftmenuicon.png" alt="Community Template" /></div>
-						            <div>
-						                 <%=t.t("community.template")%></div>
-						        </div>
-						    </div>                        
-                        </div>
-                    </div>
-                    <div id="leftmenu_iso_filter">    
-                        <div class="leftmenu_content" id="leftmenu_iso_filter_header">
-                            <div class="leftmenu_secondindent">                                
-                                <div class="leftmenu_list_icons">
-                                    <img src="images/templates_leftmenuicon.png" alt="Templates" /></div>
-                                 <%=t.t("iso")%>
+                            
+                                <div id="leftmenu_template_filter_container">
+                                    <div class="leftmenu_expandedlist">                        
+                                        <div class="leftmenu_content" id="leftmenu_submenu_my_template">
+                                            <div class="leftmenu_thirdindent">
+                                            	<div class="leftmenu_arrows white_nonexpanded_close" id="arrowIcon">
+                            					</div>
+                                                <div class="leftmenu_list_icons">
+                                                    <img src="images/templates_leftmenuicon.png" alt="My Template" /></div>
+                                                <div>
+                                                     <%=t.t("my.template")%></div>
+                                            </div>
+                                        </div> 
+                                     </div>
+                                     <div class="leftmenu_expandedlist">                       
+                                        <div class="leftmenu_content" id="leftmenu_submenu_featured_template">
+                                            <div class="leftmenu_thirdindent">
+                                            	<div class="leftmenu_arrows white_nonexpanded_close" id="arrowIcon">
+                            					</div>
+                                                <div class="leftmenu_list_icons">
+                                                    <img src="images/templates_leftmenuicon.png" alt="Featured Template" /></div>
+                                                <div>
+                                                     <%=t.t("featured.template")%></div>
+                                            </div>
+                                        </div> 
+                                     </div>  
+                                     <div class="leftmenu_expandedlist">                     
+                                        <div class="leftmenu_content" id="leftmenu_submenu_community_template">
+                                            <div class="leftmenu_thirdindent">
+                                            	<div class="leftmenu_arrows white_nonexpanded_close" id="arrowIcon">
+                            					</div>
+                                                <div class="leftmenu_list_icons">
+                                                    <img src="images/templates_leftmenuicon.png" alt="Community Template" /></div>
+                                                <div>
+                                                     <%=t.t("community.template")%></div>
+                                            </div>
+                                        </div>
+                                     </div>                        
+                                 </div>
                             </div>
-                        </div>
-                        <div id="leftmenu_iso_filter_container">
-                             <div class="leftmenu_content" id="leftmenu_submenu_my_iso">
-						        <div class="leftmenu_thirdindent">
-						            <div class="leftmenu_list_icons">
-						                <img src="images/templates_leftmenuicon.png" /></div>
-						            <div>
-						                 <%=t.t("my.iso")%></div>
-						        </div>
-						    </div>                        
-                            <div class="leftmenu_content" id="leftmenu_submenu_featured_iso">
-						        <div class="leftmenu_thirdindent">
-						            <div class="leftmenu_list_icons">
-						                <img src="images/templates_leftmenuicon.png" /></div>
-						            <div>
-						                 <%=t.t("featured.iso")%></div>
-						        </div>
-						    </div>                        
-                            <div class="leftmenu_content" id="leftmenu_submenu_community_iso">
-						        <div class="leftmenu_thirdindent">
-						            <div class="leftmenu_list_icons">
-						                <img src="images/templates_leftmenuicon.png" /></div>
-						            <div>
-						                 <%=t.t("community.iso")%></div>
-						        </div>
-						    </div>                                         
-                        </div>
-                    </div>
-                </div>
-                <div class="leftmenu_list">
-                    <div class="leftmenu_content">
-                        <div class="leftmenu_firstindent">
-                            <div class="leftmenu_arrows close" id="arrowIcon">
+                           	
+                            
+                            <div id="leftmenu_iso_filter">    
+                                    <div class="leftmenu_content" id="leftmenu_iso_filter_header">
+                                        <div class="leftmenu_secondindent"> 
+                                            <div class="leftmenu_arrows expanded_open" id="arrowIcon">
+                                            </div>                               
+                                            <div class="leftmenu_list_icons">
+                                                <img src="images/templates_leftmenuicon.png" alt="Templates" /></div>
+                                             <%=t.t("iso")%>
+                                        </div>
+                                    </div>
+                                <div id="leftmenu_iso_filter_container">
+                                	 <div class="leftmenu_expandedlist">  
+                                         <div class="leftmenu_content" id="leftmenu_submenu_my_iso">
+                                            <div class="leftmenu_thirdindent">
+                                                <div class="leftmenu_arrows white_nonexpanded_close" id="arrowIcon">
+                                                </div>
+                                                <div class="leftmenu_list_icons">
+                                                    <img src="images/templates_leftmenuicon.png" /></div>
+                                                <div>
+                                                     <%=t.t("my.iso")%></div>
+                                            </div>
+                                        </div>
+                                      </div> 
+                                       <div class="leftmenu_expandedlist">                         
+                                            <div class="leftmenu_content" id="leftmenu_submenu_featured_iso">
+                                                <div class="leftmenu_thirdindent">
+                                                    <div class="leftmenu_arrows white_nonexpanded_close" id="arrowIcon">
+                                                    </div>
+                                                    <div class="leftmenu_list_icons">
+                                                        <img src="images/templates_leftmenuicon.png" /></div>
+                                                    <div>
+                                                         <%=t.t("featured.iso")%></div>
+                                                </div>
+                                            </div>
+                                      	</div>
+                                        
+                                         <div class="leftmenu_expandedlist">                          
+                                            <div class="leftmenu_content" id="leftmenu_submenu_community_iso">
+                                                <div class="leftmenu_thirdindent">
+                                                    <div class="leftmenu_arrows white_nonexpanded_close" id="arrowIcon">
+                                                    </div>
+                                                    <div class="leftmenu_list_icons">
+                                                        <img src="images/templates_leftmenuicon.png" /></div>
+                                                    <div>
+                                                         <%=t.t("community.iso")%></div>
+                                                </div>
+                                            </div>
+                                         </div>                                         
+                                </div>
                             </div>
-                            <div class="leftmenu_list_icons">
-                                <img src="images/accounts_leftmenuicon.png" alt="Account" /></div>
-                             <%=t.t("account")%>
-                        </div>
+                        
                     </div>
+                    
                 </div>
                 <div class="leftmenu_list">
                     <div class="leftmenu_content" id="leftmenu_account">
-                        <div class="leftmenu_secondindent">
+                        <div class="leftmenu_firstindent">
+                            <div class="leftmenu_arrows nonexpanded_close" id="arrowIcon">
+                            </div>
                             <div class="leftmenu_list_icons">
                                 <img src="images/accounts_leftmenuicon.png" alt="Account" /></div>
                              <%=t.t("account")%>
                         </div>
                     </div>
                 </div>
-                <div class="leftmenu_list">
-                    <div class="leftmenu_content">
-                        <div class="leftmenu_firstindent">
-                            <div class="leftmenu_arrows close" id="arrowIcon">
-                            </div>
-                            <div class="leftmenu_list_icons">
-                                <img src="images/domain_leftmenuicon.png" alt="Domain" /></div>
-                             <%=t.t("domain")%>
-                        </div>
-                    </div>
-                </div>
+                
                 <div class="leftmenu_list">
                     <div class="leftmenu_content" id="leftmenu_domain">
-                        <div class="leftmenu_secondindent">
+                        <div class="leftmenu_firstindent">
+                            <div class="leftmenu_arrows close" id="arrowIcon">
+                            </div>
                             <div class="leftmenu_list_icons">
                                 <img src="images/domain_leftmenuicon.png" alt="Domain" /></div>
                              <%=t.t("domain")%>
                         </div>
                     </div>
+                    <div class="leftmenu_expandedbox">
+                    	<div class="leftmenu_expandedlist">  
+                            <div class="leftmenu_content">
+                                 <div class="leftmenu_domainindent" style="margin-left:30px;">
+                                    <div id="domain_title_container" class="tree_levels">
+                                        <div class="leftmenu_arrows expanded_close" id="arrowIcon">
+                                        </div>
+                                       	Domain Name
+                                    </div>
+                                    <div id="domain_children_container" style="display:none">
+                                    </div>   
+                                </div>
+                             </div>
+                         </div>
+                    </div>
                 </div>
+                
                 <div class="leftmenu_list">
                     <div class="leftmenu_content">
                         <div class="leftmenu_firstindent">
@@ -451,63 +522,144 @@ long milliseconds = new Date().getTime();
                              <%=t.t("event")%>
                         </div>
                     </div>
-                </div>
-                <div class="leftmenu_list">
-                    <div class="leftmenu_content" id="leftmenu_event">
-                        <div class="leftmenu_secondindent">
-                            <div class="leftmenu_list_icons">
-                                <img src="images/events_leftmenuicon.png" alt="Event" /></div>
-                             <%=t.t("event")%>
+                    <div class="leftmenu_expandedbox">
+                    	<div class="leftmenu_expandedlist">
+                        	<div class="leftmenu_content" id="leftmenu_event">
+                                <div class="leftmenu_secondindent">
+                                	<div class="leftmenu_arrows white_nonexpanded_close" id="arrowIcon"></div>
+                                    <div class="leftmenu_list_icons">
+                                        <img src="images/events_leftmenuicon.png" alt="Event" /></div>
+                                     <%=t.t("event")%>
+                                </div>
+                            </div>
                         </div>
-                    </div>
-                    <div class="leftmenu_content" id="leftmenu_alert">
-                        <div class="leftmenu_secondindent">
-                            <div class="leftmenu_list_icons">
-                                <img src="images/events_leftmenuicon.png" alt="Alert" /></div>
-                             <%=t.t("alert")%>
+                        <div class="leftmenu_expandedlist">
+                        	<div class="leftmenu_content" id="leftmenu_alert">
+                                <div class="leftmenu_secondindent">
+                                	<div class="leftmenu_arrows white_nonexpanded_close" id="arrowIcon"></div>
+                                    <div class="leftmenu_list_icons">
+                                        <img src="images/alert_leftmenuicon.png" alt="Alert" /></div>
+                                     <%=t.t("alert")%>
+                                </div>
+                            </div>
                         </div>
                     </div>
                 </div>
+               
                 <div class="leftmenu_list">
-                    <div class="leftmenu_content">
+                    <div class="leftmenu_content highlighted">
                         <div class="leftmenu_firstindent">
-                            <div class="leftmenu_arrows close" id="arrowIcon">
+                            <div class="leftmenu_arrows open" id="arrowIcon">
                             </div>
                             <div class="leftmenu_list_icons">
                                 <img src="images/configuration_leftmenuicon.png" alt="System" /></div>
                             <%=t.t("system")%>
                         </div>
                     </div>
+                    <div class="leftmenu_expandedbox">
+                    	<div class="leftmenu_expandedlist">
+                            <div class="leftmenu_content" id="leftmenu_resource">
+                                <div class="leftmenu_secondindent">
+                                    <div class="leftmenu_arrows expanded_close" id="arrowIcon"></div>
+                                    <div class="leftmenu_list_icons">
+                                        <img src="images/configuration_leftmenuicon.png" alt="Resources" /></div>
+                                    <%=t.t("resources")%>
+                                </div>  
+                            </div>
+                        </div>
+                        <div class="leftmenu_expandedlist">
+                            <div class="leftmenu_content" id="leftmenu_resource">
+                                <div class="leftmenu_thirdindent">
+                                    <div class="leftmenu_arrows expanded_close" id="arrowIcon"></div>
+                                    <div class="leftmenu_list_icons">
+                                        <img src="images/zone_zoneicon.png" alt="Zone" /></div>
+                                    Zone: <strong><span id="zone_name">Zone 1</span></strong>
+                                </div>  
+                            </div>
+                        </div>
+                        
+                        <div class="leftmenu_expandedlist">
+                            <div class="leftmenu_content" id="leftmenu_resource">
+                                <div class="leftmenu_fourthindent">
+                                    <div class="leftmenu_arrows expanded_close" id="arrowIcon"></div>
+                                    <div class="leftmenu_list_icons">
+                                        <img src="images/zone_podicon.png" alt="Pod" /></div>
+                                    Pod: <strong><span id="pod_name">Name of the Pod</span></strong>
+                                </div>  
+                            </div>
+                        </div>
+                        
+                        <div class="leftmenu_expandedlist">
+                            <div class="leftmenu_content" id="leftmenu_resource">
+                                <div class="leftmenu_fifthindent">
+                                    <div class="leftmenu_arrows expanded_close" id="arrowIcon"></div>
+                                    <div class="leftmenu_list_icons">
+                                        <img src="images/zone_clustericon.png" alt="Cluster" /></div>
+                                  Cluster: <strong><span id="cluster_name">(Name of the Cluster)</span></strong>
+                                </div>  
+                            </div>
+                        </div>
+                        
+                        <div class="leftmenu_expandedlist">
+                            <div class="leftmenu_content" id="leftmenu_resource">
+                                <div class="leftmenu_sixthindent">
+                                    <div class="leftmenu_arrows white_nonexpanded_close" id="arrowIcon"></div>
+                                    <div class="leftmenu_list_icons">
+                                        <img src="images/zone_hosticon.png" alt="Host" /></div>
+                                  Host: <strong><span id="host_name">(Name of the Host)</span></strong>
+                                </div>  
+                            </div>
+                        </div>
+                        
+                        <div class="leftmenu_expandedlist">
+                            <div class="leftmenu_content" id="leftmenu_resource">
+                                <div class="leftmenu_sixthindent">
+                                    <div class="leftmenu_arrows white_nonexpanded_close" id="arrowIcon"></div>
+                                    <div class="leftmenu_list_icons">
+                                        <img src="images/zone_primarystorageicon.png" alt="PrimaryStorage" /></div>
+                                 Primary: <strong><span id="primary_storage_name">(Name of the Primary Storage)</span></strong>
+                                </div>  
+                            </div>
+                        </div>
+                        
+                        <div class="leftmenu_expandedlist">
+                            <div class="leftmenu_content" style="border-bottom:1px dashed b4c8d6;" id="leftmenu_service_offering">
+                                <div class="leftmenu_secondindent">
+                                    <div class="leftmenu_arrows expanded_close" id="arrowIcon"></div>
+                                    <div class="leftmenu_list_icons">
+                                        <img src="images/configuration_leftmenuicon.png" alt="Service Offerings" /></div>
+                                    <%=t.t("service.offerings")%>
+                                </div>
+                            </div>
+                        </div>
+                        
+                        <div class="leftmenu_expandedlist">
+                            <div class="leftmenu_content" id="leftmenu_disk_offering">
+                                <div class="leftmenu_secondindent">
+                                    <div class="leftmenu_arrows expanded_close" id="arrowIcon"></div>
+                                    <div class="leftmenu_list_icons">
+                                        <img src="images/configuration_leftmenuicon.png" alt="Disk Offerings" /></div>
+                                    <%=t.t("disk.offerings")%>
+                                </div>
+                            </div>
+                        </div>
+                        
+                        <div class="leftmenu_expandedlist">
+                            <div class="leftmenu_content" id="leftmenu_global_setting">
+                                <div class="leftmenu_secondindent">
+                                    <div class="leftmenu_arrows expanded_close" id="arrowIcon"></div>
+                                    <div class="leftmenu_list_icons">
+                                        <img src="images/configuration_leftmenuicon.png" alt="Global Settings" /></div>
+                                    <%=t.t("global.settings")%>
+                                </div>
+                            </div>
+                        </div>
+               		 </div>
                 </div>
-                <div class="leftmenu_list">                    
-                    <div class="leftmenu_content" id="leftmenu_resource">
-                        <div class="leftmenu_secondindent">
-                            <div class="leftmenu_list_icons">
-                                <img src="images/configuration_leftmenuicon.png" alt="Resources" /></div>
-                            <%=t.t("resources")%>
-                        </div>
-                    </div>
-                    <div class="leftmenu_content" id="leftmenu_service_offering">
-                        <div class="leftmenu_secondindent">
-                            <div class="leftmenu_list_icons">
-                                <img src="images/configuration_leftmenuicon.png" alt="Service Offerings" /></div>
-                            <%=t.t("service.offerings")%>
-                        </div>
-                    </div>
-                    <div class="leftmenu_content" id="leftmenu_disk_offering">
-                        <div class="leftmenu_secondindent">
-                            <div class="leftmenu_list_icons">
-                                <img src="images/configuration_leftmenuicon.png" alt="Disk Offerings" /></div>
-                            <%=t.t("disk.offerings")%>
-                        </div>
-                    </div>
-                    <div class="leftmenu_content" id="leftmenu_global_setting">
-                        <div class="leftmenu_secondindent">
-                            <div class="leftmenu_list_icons">
-                                <img src="images/configuration_leftmenuicon.png" alt="Global Settings" /></div>
-                            <%=t.t("global.settings")%>
-                        </div>
-                    </div>
+                
+              
+                
+                
                 </div>
             </div>
         </div>
diff --git a/ui/new/jsp/instance.jsp b/ui/new/jsp/instance.jsp
index bf25553e5da..f72e350426b 100644
--- a/ui/new/jsp/instance.jsp
+++ b/ui/new/jsp/instance.jsp
@@ -173,7 +173,8 @@
     </div>
     <!--Details tab (end)-->
     <!--Volume tab (start)-->
-    <div style="display: none;" id="tab_content_volume">        
+    <div style="display: none;" id="tab_content_volume">    
+        Volume    
     </div>
     <!--Volume tab (end)-->
     <!--Statistics tab (start)-->
diff --git a/ui/new/jsp/resource.jsp b/ui/new/jsp/resource.jsp
index 20db32d1bc8..549329828d6 100644
--- a/ui/new/jsp/resource.jsp
+++ b/ui/new/jsp/resource.jsp
@@ -1,400 +1,529 @@
-<%@ 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>
-        Resources
-    </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 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_secondary_storage">
-            <%=t.t("secondary.storage")%></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("Accounts")%>:</div>
-                </div>
-                <div class="grid_row_cell" style="width: 79%;">
-                    <div class="row_celltitles" id="redirect_to_account_page">
-                    </div>
-                </div>
-            </div>
-            <div class="grid_rows even">
-                <div class="grid_row_cell" style="width: 20%;">
-                    <div class="row_celltitles">
-                        <%=t.t("Instances")%>:</div>
-                </div>
-                <div class="grid_row_cell" style="width: 79%;">
-                    <div class="row_celltitles" id="redirect_to_instance_page">
-                    </div>
-                </div>
-            </div>
-            <div class="grid_rows odd">
-                <div class="grid_row_cell" style="width: 20%;">
-                    <div class="row_celltitles">
-                        <%=t.t("Volume")%>:</div>
-                </div>
-                <div class="grid_row_cell" style="width: 79%;">
-                    <div class="row_celltitles" id="redirect_to_volume_page">
-                    </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">
-                        	<p>Zone 1</p>
-                        </div>
-                        <div class="networkdg_zoneconnect"></div>
-                    </div>
-                    <div class="networkswitchpanel">
-                    	<div class="networkswitch_titlebox"><p>Guest VLAN 1000 -1001</p></div>
-                        <div class="networkswitch_top"></div>
-                        <div class="networkswitch_midpanel">
-                        	
-                            <div class="networkswitch_vlanpanel">
-                            	<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">VM Group:</div> <span>VLAN 10</span>
-                                        </div>
-                                        
-                                        <div class="networkswitch_vlan_detailsbox_textbox">
-                                        	<div class="networkswitch_vlan_detailsbox_textbox_label">IP:</div> <span>10.101.24.231</span>
-                                        </div>
-                                        
-                                    </div>
-                                    <div class="networkswitch_typeicon direct"></div>
-                                </div>
-                            </div>
-                            
-                            <div class="networkswitch_vlanpanel">
-                            	<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">VM Group:</div> <span>VLAN 10</span>
-                                        </div>
-                                        
-                                        <div class="networkswitch_vlan_detailsbox_textbox">
-                                        	<div class="networkswitch_vlan_detailsbox_textbox_label">IP:</div> <span>10.101.24.231</span>
-                                        </div>
-                                        
-                                    </div>
-                                    <div class="networkswitch_typeicon virtual"></div>
-                                </div>
-                            </div>
-                            
-                            
-                           
-                        </div>
-                        <div class="networkswitch_end"></div>
-                    </div>
-                </div>
-             </div>
-        </div>
-    
-    </div>
-    <!-- Network tab (end)-->
-    
-    <!-- Secondary Storage tab (start)-->
-    <div id="tab_content_secondary_storage" style="display:none">        
-    </div>
-    <!-- Secondary Storage tab (end)-->    
-</div>
-<!-- domain detail panel (end) -->
-
-<!-- treenode template (begin) -->
-<div id="treenode_template" class="tree_levelspanel" style="display:none">
-	<div class="tree_levelsbox" style="margin-left:20px;">
-        <div id="domain_title_container" class="tree_levels">
-            <div id="domain_expand_icon" class="zonetree_closedarrows"></div>
-            <div id="domain_name" class="tree_links">Domain Name</div>
-        </div>
-		<div id="domain_children_container" style="display:none">
-		</div>   
-    </div>
-</div>
-<!-- treenode template (end) -->
-
-<!-- admin account tab template (begin) -->
-<div class="grid_container" id="admin_account_tab_template" style="display: none">
-    <div class="grid_header">
-        <div class="grid_header_title" id="title">
-        </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("Role")%>:</div>
-        </div>
-        <div class="grid_row_cell" style="width: 79%;">
-            <div class="row_celltitles" id="role">
-            </div>
-        </div>
-    </div>
-    <div class="grid_rows even">
-        <div class="grid_row_cell" style="width: 20%;">
-            <div class="row_celltitles">
-                <%=t.t("Account")%>:</div>
-        </div>
-        <div class="grid_row_cell" style="width: 79%;">
-            <div class="row_celltitles" id="account">
-            </div>
-        </div>
-    </div>
-    <div class="grid_rows odd">
-        <div class="grid_row_cell" style="width: 20%;">
-            <div class="row_celltitles">
-                <%=t.t("Domain")%>:</div>
-        </div>
-        <div class="grid_row_cell" style="width: 79%;">
-            <div class="row_celltitles" id="domain">
-            </div>
-        </div>
-    </div>
-    <div class="grid_rows even">
-        <div class="grid_row_cell" style="width: 20%;">
-            <div class="row_celltitles">
-                <%=t.t("VMs")%>:</div>
-        </div>
-        <div class="grid_row_cell" style="width: 79%;">
-            <div class="row_celltitles" id="vm_total">
-            </div>
-        </div>
-    </div>
-    <div class="grid_rows odd">
-        <div class="grid_row_cell" style="width: 20%;">
-            <div class="row_celltitles">
-                <%=t.t("IPs")%>:</div>
-        </div>
-        <div class="grid_row_cell" style="width: 79%;">
-            <div class="row_celltitles" id="ip_total">
-            </div>
-        </div>
-    </div>
-    <div class="grid_rows even">
-        <div class="grid_row_cell" style="width: 20%;">
-            <div class="row_celltitles">
-                <%=t.t("Bytes.Received")%>:</div>
-        </div>
-        <div class="grid_row_cell" style="width: 79%;">
-            <div class="row_celltitles" id="bytes_received">
-            </div>
-        </div>
-    </div>
-    <div class="grid_rows odd">
-        <div class="grid_row_cell" style="width: 20%;">
-            <div class="row_celltitles">
-                <%=t.t("Bytes.Sent")%>:</div>
-        </div>
-        <div class="grid_row_cell" style="width: 79%;">
-            <div class="row_celltitles" id="bytes_sent">
-            </div>
-        </div>
-    </div>
-    <div class="grid_rows even">
-        <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>
-<!-- admin account tab template (end) -->
-
-<!-- Zonetree Template (begin) -->
-<div class="zonetree_contentbox" id="zonetree" style="display:none">
-    <div id="zones_container">
-    </div>
-</div>
-<!-- Zonetree Template (end) -->
-
-<!-- Zone Template (begin) -->
-<div id="zone_template" style="display:none">
-    <div class="adding_loading" style="height:25px;display:none" id="loading_container">
-	    <div class="adding_animation"></div>
-	    <div class="adding_text">Adding a zone &hellip; </div>
-    </div>
-    <div id="row_container">
-	    <div class="leftmenu_content">
-        	<div class="leftmenu_firstindent">
-                <div class="zonetree_closedarrows" id="zone_expand"></div>
-                <div class="leftmenu_list_icons"><img src="images/zone_zoneicon.png" alt="Zone" /></div>
-                Zone: <strong><span id="zone_name">Zone 1</span></strong>
-            </div>
-	    </div>
-	    <div id="zone_content" style="display:none">
-		    <div id="pods_container">
-		    </div>	
-		    <div id="systemvms_container">
-		    </div>		  
-	    </div>
-	</div>
-</div>
-<!-- Zone Template (end) -->
-
-<!-- Pod Template (begin) -->
-    <div id="pod_template" style="display:none">
-        <div class="adding_loading" style="height:25px;display:none" id="loading_container">
-            <div class="adding_animation"></div>
-            <div class="adding_text">Adding a pod &hellip; </div>
-        </div>
-        <div id="row_container">  
-            <div class="leftmenu_content">
-            	<div class="leftmenu_secondindent">
-                    <div class="zonetree_openarrows" id="zone_expand"></div>
-                    <div class="leftmenu_list_icons"><img src="images/zone_podicon.png" alt="Pod" /></div>
-                    Pod: <strong><span id="pod_name">Name of the Pod</span></strong>
-                </div>
-            </div>
-            <div id="pod_content">
-                <!--  
-                <div id="directip_ranges_container">
-                </div>
-		    -->
-		    <div id="clusters_container">
-		    </div>
-	    </div>
-	</div>
-</div>
-<!-- Pod Template (end) -->
-
-<!-- SystemVM Template (begin) -->
-<div id="systemvm_template" style="display:none">	
-    <div id="row_container">  
-	    <div class="leftmenu_content">
-        	<div class="leftmenu_secondindent">
-            	<div class="zonetree_openarrows" style="background:none;"></div>
-                <div class="leftmenu_list_icons"><img src="images/zone_systemvmicon.png" alt="System VM" /></div>
-                System VM: <strong><span id="systemvm_name">(System VM name)</span></strong>
-            </div>
-	    </div>	    
-	</div>
-</div>
-<!-- SystemVM Template (end) -->
-
-<!-- Cluster Template (begin) -->
-<div id="cluster_template" style="display:none">
-    <div class="adding_loading" style="height:25px;display:none" id="loading_container">
-	    <div class="adding_animation"></div>
-	    <div class="adding_text">Adding a cluster &hellip; </div>
-    </div>
-    <div id="row_container">  
-	    <div class="leftmenu_content">
-        	<div class="leftmenu_thirdindent">
-            	<div class="zonetree_openarrows" id="zone_expand"></div>
-                <div class="leftmenu_list_icons"><img src="images/zone_clustericon.png" alt="Cluster" /></div>
-                Cluster: <strong><span id="cluster_name">(Name of the Cluster)</span></strong>
-            </div>
-	    </div>	    
-	    <div id="cluster_content">	        
-		    <div id="hosts_container">
-		    </div>
-		    <div id="primarystorages_container">
-		    </div>
-	    </div>    
-	</div>
-</div>
-<!-- Cluster Template (end) -->
-
-<!-- Host Template (begin) -->
-<div id="host_template" style="display:none">
-    <div class="adding_loading" style="height:25px;display:none" id="loading_container">
-	    <div class="adding_animation"></div>
-	    <div class="adding_text">Adding a host &hellip; </div>
-    </div>
-    <div id="row_container">  
-	    <div class="leftmenu_content">
-        	<div class="leftmenu_fourthindent">
-                <div class="leftmenu_list_icons"><img src="images/zone_hosticon.png" alt="Host" /></div>
-                Host: <strong><span id="host_name">(Name of the Host)</span></strong>
-            </div>
-	    </div>
-	</div>
-</div>
-<!-- Host Template (end) -->
-
-<!-- Primary Storage Template (begin) -->
-<div id="primary_storage_template" style="display:none">
-    <div class="adding_loading" style="height:25px;display:none" id="loading_container">
-	    <div class="adding_animation"></div>
-	    <div class="adding_text">Adding a primary storage &hellip; </div>
-    </div>
-    <div id="row_container">  
-	    <div class="leftmenu_content">
-        	<div class="leftmenu_fourthindent">
-                <div class="leftmenu_list_icons"><img src="images/zone_primarystorageicon.png" alt="PrimaryStorage" /></div>
-                Primary: <strong><span id="primary_storage_name">(Name of the Primary Storage)</span></strong>
-            </div>
-	    </div>
-	</div>
-</div>
-<!-- Primary Storage Template (end) -->
-
-
+<%@ 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>
+        Resources
+    </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_secondary_storage">
+                <%=t.t("secondary.storage")%></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 even">
+                    <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 even">
+                    <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 even">
+                    <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">
+                                <p>
+                                    Zone 1</p>
+                            </div>
+                            <div class="networkdg_zoneconnect">
+                            </div>
+                        </div>
+                        <div class="networkswitchpanel">
+                            <div class="networkswitch_titlebox">
+                                <p>
+                                    Guest VLAN 1000 -1001</p>
+                            </div>
+                            <div class="networkswitch_top">
+                            </div>
+                            <div class="networkswitch_midpanel">
+                                <div class="networkswitch_vlanpanel">
+                                    <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">
+                                                    VM Group:</div>
+                                                <span>VLAN 10</span>
+                                            </div>
+                                            <div class="networkswitch_vlan_detailsbox_textbox">
+                                                <div class="networkswitch_vlan_detailsbox_textbox_label">
+                                                    IP:</div>
+                                                <span>10.101.24.231</span>
+                                            </div>
+                                        </div>
+                                        <div class="networkswitch_typeicon direct">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="networkswitch_vlanpanel">
+                                    <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">
+                                                    VM Group:</div>
+                                                <span>VLAN 10</span>
+                                            </div>
+                                            <div class="networkswitch_vlan_detailsbox_textbox">
+                                                <div class="networkswitch_vlan_detailsbox_textbox_label">
+                                                    IP:</div>
+                                                <span>10.101.24.231</span>
+                                            </div>
+                                        </div>
+                                        <div class="networkswitch_typeicon virtual">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="networkswitch_end">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <!-- Network tab (end)-->
+        <!-- Secondary Storage tab (start)-->
+        <div id="tab_content_secondary_storage" 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_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 even">
+                    <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 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>
+        </div>
+        <!-- Details tab (end)-->
+    </div>
+    <div id="cluster_page" style="display:none">
+        Cluster Page
+    </div>
+    <div id="host_page" style="display:none">
+        Host page
+    </div>
+    <div id="primarystorage_page" style="display:none">
+        Primary Storage Page
+    </div>
+    <div id="systemvm_page" style="display:none">
+        System VM Page
+    </div>    
+</div>
+<!-- domain detail panel (end) -->
+<!-- treenode template (begin) -->
+<div id="treenode_template" class="tree_levelspanel" style="display: none">
+    <div class="tree_levelsbox" style="margin-left: 20px;">
+        <div id="domain_title_container" class="tree_levels">
+            <div id="domain_expand_icon" class="zonetree_closedarrows">
+            </div>
+            <div id="domain_name" class="tree_links">
+                Domain Name</div>
+        </div>
+        <div id="domain_children_container" style="display: none">
+        </div>
+    </div>
+</div>
+<!-- treenode template (end) -->
+<!-- admin account tab template (begin) -->
+<div class="grid_container" id="admin_account_tab_template" style="display: none">
+    <div class="grid_header">
+        <div class="grid_header_title" id="title">
+        </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("Role")%>:</div>
+        </div>
+        <div class="grid_row_cell" style="width: 79%;">
+            <div class="row_celltitles" id="role">
+            </div>
+        </div>
+    </div>
+    <div class="grid_rows even">
+        <div class="grid_row_cell" style="width: 20%;">
+            <div class="row_celltitles">
+                <%=t.t("Account")%>:</div>
+        </div>
+        <div class="grid_row_cell" style="width: 79%;">
+            <div class="row_celltitles" id="account">
+            </div>
+        </div>
+    </div>
+    <div class="grid_rows odd">
+        <div class="grid_row_cell" style="width: 20%;">
+            <div class="row_celltitles">
+                <%=t.t("Domain")%>:</div>
+        </div>
+        <div class="grid_row_cell" style="width: 79%;">
+            <div class="row_celltitles" id="domain">
+            </div>
+        </div>
+    </div>
+    <div class="grid_rows even">
+        <div class="grid_row_cell" style="width: 20%;">
+            <div class="row_celltitles">
+                <%=t.t("VMs")%>:</div>
+        </div>
+        <div class="grid_row_cell" style="width: 79%;">
+            <div class="row_celltitles" id="vm_total">
+            </div>
+        </div>
+    </div>
+    <div class="grid_rows odd">
+        <div class="grid_row_cell" style="width: 20%;">
+            <div class="row_celltitles">
+                <%=t.t("IPs")%>:</div>
+        </div>
+        <div class="grid_row_cell" style="width: 79%;">
+            <div class="row_celltitles" id="ip_total">
+            </div>
+        </div>
+    </div>
+    <div class="grid_rows even">
+        <div class="grid_row_cell" style="width: 20%;">
+            <div class="row_celltitles">
+                <%=t.t("Bytes.Received")%>:</div>
+        </div>
+        <div class="grid_row_cell" style="width: 79%;">
+            <div class="row_celltitles" id="bytes_received">
+            </div>
+        </div>
+    </div>
+    <div class="grid_rows odd">
+        <div class="grid_row_cell" style="width: 20%;">
+            <div class="row_celltitles">
+                <%=t.t("Bytes.Sent")%>:</div>
+        </div>
+        <div class="grid_row_cell" style="width: 79%;">
+            <div class="row_celltitles" id="bytes_sent">
+            </div>
+        </div>
+    </div>
+    <div class="grid_rows even">
+        <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>
+<!-- admin account tab template (end) -->
+<!-- Zonetree Template (begin) -->
+<div class="zonetree_contentbox" id="zonetree" style="display: none">
+    <div id="zones_container">
+    </div>
+</div>
+<!-- Zonetree Template (end) -->
+<!-- Zone Template (begin) -->
+<div id="zone_template" style="display: none">
+    <div class="adding_loading" style="height: 25px; display: none" id="loading_container">
+        <div class="adding_animation">
+        </div>
+        <div class="adding_text">
+            Adding a zone &hellip;
+        </div>
+    </div>
+    <div id="row_container">
+        <div class="leftmenu_content" id="zone_node">
+            <div class="leftmenu_firstindent">
+                <div class="zonetree_closedarrows" id="zone_expand">
+                </div>
+                <div class="leftmenu_list_icons">
+                    <img src="images/zone_zoneicon.png" id="zone_icon" alt="Zone" /></div>
+                <span id="zone_label">Zone:</span> <strong><span id="zone_name">Zone 1</span> </strong>
+            </div>
+        </div>
+        <div id="zone_content" style="display: none">
+            <div id="pods_container">
+            </div>
+            <div id="systemvms_container">
+            </div>
+        </div>
+    </div>
+</div>
+<!-- Zone Template (end) -->
+<!-- Pod Template (begin) -->
+<div id="pod_template" style="display: none">
+    <div class="adding_loading" style="height: 25px; display: none" id="loading_container">
+        <div class="adding_animation">
+        </div>
+        <div class="adding_text">
+            Adding a pod &hellip;
+        </div>
+    </div>
+    <div id="row_container">
+        <div class="leftmenu_content" id="pod_node">
+            <div class="leftmenu_secondindent">
+                <div class="zonetree_closedarrows" id="pod_expand">
+                </div>
+                <div class="leftmenu_list_icons">
+                    <img src="images/zone_podicon.png" id="pod_icon" alt="Pod" /></div>
+                <span id="pod_label">Pod:</span> <strong><span id="pod_name">Name of the Pod</span>
+                </strong>
+            </div>
+        </div>
+        <div id="pod_content" style="display: none">
+            <div id="clusters_container">
+            </div>
+        </div>
+    </div>
+</div>
+<!-- Pod Template (end) -->
+<!-- Cluster Template (begin) -->
+<div id="cluster_template" style="display: none">
+    <div class="adding_loading" style="height: 25px; display: none" id="loading_container">
+        <div class="adding_animation">
+        </div>
+        <div class="adding_text">
+            Adding a cluster &hellip;
+        </div>
+    </div>
+    <div id="row_container">
+        <div class="leftmenu_content" id="cluster_node">
+            <div class="leftmenu_thirdindent">
+                <div class="zonetree_openarrows" id="cluster_expand">
+                </div>
+                <div class="leftmenu_list_icons">
+                    <img src="images/zone_clustericon.png" id="cluster_icon" alt="Cluster" /></div>
+                <span id="cluster_label"">Cluster:</span> <strong><span id="cluster_name">(Name of the
+                    Cluster)</span> </strong>
+            </div>
+        </div>
+        <div id="cluster_content">
+            <div id="hosts_container">
+            </div>
+            <div id="primarystorages_container">
+            </div>
+        </div>
+    </div>
+</div>
+<!-- Cluster Template (end) -->
+<!-- Host Template (begin) -->
+<div id="host_template" style="display: none">
+    <div class="adding_loading" style="height: 25px; display: none" id="loading_container">
+        <div class="adding_animation">
+        </div>
+        <div class="adding_text">
+            Adding a host &hellip;
+        </div>
+    </div>
+    <div id="row_container">
+        <div class="leftmenu_content" id="host_node">
+            <div class="leftmenu_fourthindent">
+                <div class="leftmenu_list_icons">
+                    <img src="images/zone_hosticon.png" id="host_icon" alt="Host" /></div>
+                <span id="host_label">Host:</span> <strong><span id="host_name">(Name of the Host)</span>
+                </strong>
+            </div>
+        </div>
+    </div>
+</div>
+<!-- Host Template (end) -->
+<!-- Primary Storage Template (begin) -->
+<div id="primarystorage_template" style="display: none">
+    <div class="adding_loading" style="height: 25px; display: none" id="loading_container">
+        <div class="adding_animation">
+        </div>
+        <div class="adding_text">
+            Adding a primary storage &hellip;
+        </div>
+    </div>
+    <div id="row_container">
+        <div class="leftmenu_content" id="primarystorage_node">
+            <div class="leftmenu_fourthindent">
+                <div class="leftmenu_list_icons">
+                    <img src="images/zone_primarystorageicon.png" id="primarystorage_icon" alt="PrimaryStorage" /></div>
+                <span id="primarystorage_label">Storage:</span> <strong><span id="primarystorage_name">
+                    (Name of the Primary Storage)</span> </strong>
+            </div>
+        </div>
+    </div>
+</div>
+<!-- Primary Storage Template (end) -->
+<!-- SystemVM Template (begin) -->
+<div id="systemvm_template" style="display: none">
+    <div id="row_container">
+        <div class="leftmenu_content" id="systemvm_node">
+            <div class="leftmenu_secondindent">
+                <div class="leftmenu_list_icons">
+                    <img src="images/zone_systemvmicon.png" id="systemvm_icon" alt="System VM" /></div>
+                <span id="systemvm_label">System VM:</span> <strong><span id="systemvm_name">(System
+                    VM name)</span> </strong>
+            </div>
+        </div>
+    </div>
+</div>
+<!-- SystemVM Template (end) -->
diff --git a/ui/new/scripts/cloud.core2.domain.js b/ui/new/scripts/cloud.core2.domain.js
index 12d7a4f828c..e93bbb169fa 100644
--- a/ui/new/scripts/cloud.core2.domain.js
+++ b/ui/new/scripts/cloud.core2.domain.js
@@ -238,8 +238,8 @@ function afterLoadDomainJSP() {
 	refreshWholeTree(defaultRootDomainId, defaultRootLevel);
 		
 	//***** switch between different tabs (begin) ********************************************************************
-    var tabArray = ["tab_details", "tab_resource_limits", "tab_admin_account"];
-    var tabContentArray = ["tab_content_details", "tab_content_resource_limits", "tab_content_admin_account"];
+    var tabArray = [$("#tab_details"), $("#tab_resource_limits"), $("#tab_admin_account")];
+    var tabContentArray = [$("#tab_content_details"), $("#tab_content_resource_limits"), $("#tab_content_admin_account")];
     switchBetweenDifferentTabs(tabArray, tabContentArray);       
     //***** switch between different tabs (end) **********************************************************************
 	    
diff --git a/ui/new/scripts/cloud.core2.init.js b/ui/new/scripts/cloud.core2.init.js
index 1d2dde2dda2..3505bfcec21 100644
--- a/ui/new/scripts/cloud.core2.init.js
+++ b/ui/new/scripts/cloud.core2.init.js
@@ -1,19 +1,5 @@
 $(document).ready(function() {     
-    $("#accordion_menu").accordion({
-        autoHeight: false, 
-        collapsible: true,
-        active: false,
-        change: function(event, ui) {   
-            if(ui.newContent.length==0)  //collapse
-                ui.oldHeader.find("#arrow_icon").removeClass("open").addClass("close");            
-            else  //expand
-                ui.newHeader.find("#arrow_icon").removeClass("close").addClass("open"); 
-                
-            //collapse submenu instanceGroup under menu instance
-            $("#leftmenu_instance_group_header").find("#arrow_icon").removeClass("open").addClass("close");            
-            $("#leftmenu_instance_group_container").empty();     
-        }
-    });
+
     $("#accordion_menu").show();
        
     var $midmenuItem = $("#midmenu_item");
@@ -30,13 +16,13 @@ $(document).ready(function() {
             clearLeftMenu();
             clearMiddleMenu();
             
-            $("#right_panel").load(rightPanelJSP, function(){                   
+            $("#right_panel").load(rightPanelJSP, function(){                   
                 $("#right_panel_content #tab_content_details #action_message_box #close_button").bind("click", function(event){    
                     $(this).parent().hide();
                     return false;
-                });  
-                                     
-                var $actionLink = $("#right_panel_content #tab_content_details #action_link");
+                });  
+                                     
+                var $actionLink = $("#right_panel_content #tab_content_details #action_link");
 	            $actionLink.bind("mouseover", function(event) {	    
                     $(this).find("#action_menu").show();    
                     return false;
@@ -44,14 +30,14 @@ $(document).ready(function() {
                 $actionLink.bind("mouseout", function(event) {       
                     $(this).find("#action_menu").hide();    
                     return false;
-                });	   
-                              
-                afterLoadRightPanelJSPFn();    
-                            
-                $.ajax({
-	                cache: false,
+                });	   
+                              
+                afterLoadRightPanelJSPFn();    
+                            
+                $.ajax({
+	                cache: false,
 	                data: createURL("command="+commandString+"&pagesize="+midmenuItemCount),
-	                dataType: "json",
+	                dataType: "json",
 	                success: function(json) {		                    
 	                    selectedItemsInMidMenu = {};    	                
 	                    var items = json[jsonResponse1][jsonResponse2];
@@ -59,7 +45,7 @@ $(document).ready(function() {
 	                        for(var i=0; i<items.length;i++) { 
                                 var $midmenuItem1 = $midmenuItem.clone();  
                                 $midmenuItem1.data("toRightPanelFn", toRightPanelFn);                             
-                                toMidmenuFn(items[i], $midmenuItem1);    
+                                toMidmenuFn(items[i], $midmenuItem1);    
                                 bindClickToMidMenu($midmenuItem1, toRightPanelFn, getMidmenuIdFn);             
                                 $("#midmenu_container").append($midmenuItem1.show());   
                                 if(i == 0)  //click the 1st item in middle menu as default 
@@ -121,7 +107,7 @@ $(document).ready(function() {
         clearLeftMenu();
         clearMiddleMenu();
         
-        $("#right_panel").load("jsp/domain.jsp", function(){ 
+        $("#right_panel").load("jsp/domain.jsp", function(){ 
             afterLoadDomainJSP();       
         });     
         return false;
@@ -139,7 +125,7 @@ $(document).ready(function() {
         clearLeftMenu();
         clearMiddleMenu();
                 
-        $("#right_panel").load("jsp/resource.jsp", function(){ 
+        $("#right_panel").load("jsp/resource.jsp", function(){ 
             afterLoadResourceJSP();       
         });     
                 
@@ -173,484 +159,484 @@ $(document).ready(function() {
 		alert("Detected a frame not from the same domain (" + self.location.hostname + ").  Moving app to top of browser to prevent any security tampering.");
 		top.location.href = window.location.href;
 	}
-
-	// We don't support IE6 at the moment, so let's just inform customers it won't work
-	var IE6 = false /*@cc_on || @_jscript_version < 5.7 @*/;
-	var gteIE7 = false /*@cc_on || @_jscript_version >= 5.7 @*/;
-
-	// Disable IE6 browsers as UI does not support it
-	if (IE6 == true) {
-		alert("Only IE7, IE8, FireFox 3.x, Chrome, and Safari browsers are supported at this time.");
-		return;
-	}
-	
-	/*
-	initializeTestTool();
-	*/
-	
-	// We will be dropping all the main tab content into this container
-	mainContainer = $("#maincontentarea");
-
-	// Tab Links, dashboard is the initial active tab
-	mainContainer.load("content/tab_dashboard.html");
-	
-	// Default AJAX Setup
-	$.ajaxSetup({
-		url: "/client/api",
-		dataType: "json",
-		cache: false,
-		error: function(XMLHttpResponse) {
-			handleError(XMLHttpResponse);
-		},
-		beforeSend: function(XMLHttpRequest) {
-			if (g_mySession == $.cookie("JSESSIONID")) {
-				return true;
-			} else {
-				$("#dialog_session_expired").dialog("open");
-				return false;
-			}
-		}		
-	});
-	
-	// LOGIN/LOGOUT
-	// 'Enter' Key in any login form element = Submit click
+
+	// We don't support IE6 at the moment, so let's just inform customers it won't work
+	var IE6 = false /*@cc_on || @_jscript_version < 5.7 @*/;
+	var gteIE7 = false /*@cc_on || @_jscript_version >= 5.7 @*/;
+
+	// Disable IE6 browsers as UI does not support it
+	if (IE6 == true) {
+		alert("Only IE7, IE8, FireFox 3.x, Chrome, and Safari browsers are supported at this time.");
+		return;
+	}
+	
+	/*
+	initializeTestTool();
+	*/
+	
+	// We will be dropping all the main tab content into this container
+	mainContainer = $("#maincontentarea");
+
+	// Tab Links, dashboard is the initial active tab
+	mainContainer.load("content/tab_dashboard.html");
+	
+	// Default AJAX Setup
+	$.ajaxSetup({
+		url: "/client/api",
+		dataType: "json",
+		cache: false,
+		error: function(XMLHttpResponse) {
+			handleError(XMLHttpResponse);
+		},
+		beforeSend: function(XMLHttpRequest) {
+			if (g_mySession == $.cookie("JSESSIONID")) {
+				return true;
+			} else {
+				$("#dialog_session_expired").dialog("open");
+				return false;
+			}
+		}		
+	});
+	
+	// LOGIN/LOGOUT
+	// 'Enter' Key in any login form element = Submit click
 	$("#logoutpage #loginForm").keypress(function(event) {
-		var formId = $(event.target).attr("id");
-		if(event.keyCode == keycode_Enter && formId != "loginbutton") {
-			login();
-		}
-	});
-	
-	$("#logoutpage .loginbutton").bind("click", function(event) {
-		login();
-		return false;
-	});
-	
-	$("#logoutaccount_link").bind("click", function(event) {
-		$.ajax({
-		        data: createURL("command=logout&response=json"),
-			dataType: "json",
-			success: function(json) {
-				logout(true);
-			},
-			error: function() {
-				logout(true);
-			},
-			beforeSend : function(XMLHTTP) {
-				return true;
-			}
-		});
-	});
-	
-	// FUNCTION: logs the user out
+		var formId = $(event.target).attr("id");
+		if(event.keyCode == keycode_Enter && formId != "loginbutton") {
+			login();
+		}
+	});
+	
+	$("#logoutpage .loginbutton").bind("click", function(event) {
+		login();
+		return false;
+	});
+	
+	$("#logoutaccount_link").bind("click", function(event) {
+		$.ajax({
+		        data: createURL("command=logout&response=json"),
+			dataType: "json",
+			success: function(json) {
+				logout(true);
+			},
+			error: function() {
+				logout(true);
+			},
+			beforeSend : function(XMLHTTP) {
+				return true;
+			}
+		});
+	});
+	
+	// FUNCTION: logs the user out
 	var activeTab = null;
-	function logout(refresh) {
-		g_mySession = null;
+	function logout(refresh) {
+		g_mySession = null;
                 g_sessionKey = null;
-		g_username = null;	
-		g_account = null;
-		g_domainid = null;	
+		g_username = null;	
+		g_account = null;
+		g_domainid = null;	
 		g_timezoneoffset = null;
-		g_timezone = null;
-		
-		$.cookie('JSESSIONID', null);
-		$.cookie('sessionKey', null);
-		$.cookie('username', null);
-		$.cookie('account', null);
-		$.cookie('domainid', null);
-		$.cookie('role', null);
-		$.cookie('networktype', null); 
+		g_timezone = null;
+		
+		$.cookie('JSESSIONID', null);
+		$.cookie('sessionKey', null);
+		$.cookie('username', null);
+		$.cookie('account', null);
+		$.cookie('domainid', null);
+		$.cookie('role', null);
+		$.cookie('networktype', null); 
 		$.cookie('timezoneoffset', null);
-		$.cookie('timezone', null);
-		
+		$.cookie('timezone', null);
+		
 		$("body").stopTime();
 		
-		// default is to redisplay the login page
+		// default is to redisplay the login page
 		if (onLogoutCallback()) {
 			if (refresh) {
 				location.replace('/client');
 				return false;
-			}
-			$("#account_password").val("");
-			$(".loginbutton_box p").hide();
-			$("#logoutpage").show();
-			$("body").css("background", "#4e4e4e url(images/logout_bg.gif) repeat-x top left");
-			mainContainer.empty();
-			$("#mainmaster").hide();
-			$("#overlay_black").hide();
-			
-			var menuOnClass = "menutab_on";
-			var menuOffClass = "menutab_off";
-			var tab = null;
-			if (isAdmin()) {
-				tab = $("#menutab_dashboard_root");
-				menuOnClass = "admin_menutab_on";
-				menuOffClass = "admin_menutab_off";
-			} else if (isDomainAdmin()) {
-				tab = $("#menutab_dashboard_domain");
-				menuOnClass = "admin_menutab_on";
-				menuOffClass = "admin_menutab_off";
-			} else if (isUser()) {
-				tab = $("#menutab_dashboard_user");
-				menuOnClass = "menutab_on";
-				menuOffClass = "menutab_off";
-			}
-			if (activeTab != null) {
-				activeTab.removeClass(menuOnClass).addClass(menuOffClass);
-				activeTab = null;
-			}
-			if (tab != null) {
-				tab.removeClass(menuOffClass).addClass(menuOnClass);
-			}
-			g_role = null;
-			$("#account_username").focus();
-		}
-	}
-	
-	// FUNCTION: logs the user in
-	function login() {
-		var array1 = [];
-		var username = encodeURIComponent($("#account_username").val());
-		array1.push("&username="+username);
-		
-		var password = $.md5(encodeURIComponent($("#account_password").val()));
-		array1.push("&password="+password);
-		
-		var domain = encodeURIComponent($("#account_domain").val());
-		if(domain != null && domain.length > 0)
-		    array1.push("&domain="+domain);
-		
+			}
+			$("#account_password").val("");
+			$(".loginbutton_box p").hide();
+			$("#logoutpage").show();
+			$("body").css("background", "#4e4e4e url(images/logout_bg.gif) repeat-x top left");
+			mainContainer.empty();
+			$("#mainmaster").hide();
+			$("#overlay_black").hide();
+			
+			var menuOnClass = "menutab_on";
+			var menuOffClass = "menutab_off";
+			var tab = null;
+			if (isAdmin()) {
+				tab = $("#menutab_dashboard_root");
+				menuOnClass = "admin_menutab_on";
+				menuOffClass = "admin_menutab_off";
+			} else if (isDomainAdmin()) {
+				tab = $("#menutab_dashboard_domain");
+				menuOnClass = "admin_menutab_on";
+				menuOffClass = "admin_menutab_off";
+			} else if (isUser()) {
+				tab = $("#menutab_dashboard_user");
+				menuOnClass = "menutab_on";
+				menuOffClass = "menutab_off";
+			}
+			if (activeTab != null) {
+				activeTab.removeClass(menuOnClass).addClass(menuOffClass);
+				activeTab = null;
+			}
+			if (tab != null) {
+				tab.removeClass(menuOffClass).addClass(menuOnClass);
+			}
+			g_role = null;
+			$("#account_username").focus();
+		}
+	}
+	
+	// FUNCTION: logs the user in
+	function login() {
+		var array1 = [];
+		var username = encodeURIComponent($("#account_username").val());
+		array1.push("&username="+username);
+		
+		var password = $.md5(encodeURIComponent($("#account_password").val()));
+		array1.push("&password="+password);
+		
+		var domain = encodeURIComponent($("#account_domain").val());
+		if(domain != null && domain.length > 0)
+		    array1.push("&domain="+domain);
+		
 		$.ajax({
-			type: "POST",
-		        data: createURL("command=login&response=json" + array1.join("")),
-			dataType: "json",
-			async: false,
-			success: function(json) {
-				g_mySession = $.cookie('JSESSIONID');
-				g_sessionKey = encodeURIComponent(json.loginresponse.sessionkey);
-				g_role = json.loginresponse.type;
-				g_username = json.loginresponse.username;	
-				g_account = json.loginresponse.account;
+			type: "POST",
+		        data: createURL("command=login&response=json" + array1.join("")),
+			dataType: "json",
+			async: false,
+			success: function(json) {
+				g_mySession = $.cookie('JSESSIONID');
+				g_sessionKey = encodeURIComponent(json.loginresponse.sessionkey);
+				g_role = json.loginresponse.type;
+				g_username = json.loginresponse.username;	
+				g_account = json.loginresponse.account;
 				g_domainid = json.loginresponse.domainid;	
-				g_timezone = json.loginresponse.timezone;								
-				g_timezoneoffset = json.loginresponse.timezoneoffset;					
-				if (json.loginresponse.networktype != null) 
-					g_networkType = json.loginresponse.networktype;				
-				if (json.loginresponse.hypervisortype != null) 
-					g_hypervisorType = json.loginresponse.hypervisortype;				
-				if (json.loginresponse.directattachnetworkgroupsenabled != null) 
+				g_timezone = json.loginresponse.timezone;								
+				g_timezoneoffset = json.loginresponse.timezoneoffset;					
+				if (json.loginresponse.networktype != null) 
+					g_networkType = json.loginresponse.networktype;				
+				if (json.loginresponse.hypervisortype != null) 
+					g_hypervisorType = json.loginresponse.hypervisortype;				
+				if (json.loginresponse.directattachnetworkgroupsenabled != null) 
 					g_directAttachNetworkGroupsEnabled = json.loginresponse.directattachnetworkgroupsenabled;
 				if (json.loginresponse.directattacheduntaggedenabled != null) 
-					g_directAttachedUntaggedEnabled = json.loginresponse.directattacheduntaggedenabled;
-                if (json.loginresponse.systemvmuselocalstorage != null) 
+					g_directAttachedUntaggedEnabled = json.loginresponse.directattacheduntaggedenabled;
+                if (json.loginresponse.systemvmuselocalstorage != null) 
 					g_systemVmUseLocalStorage = json.loginresponse.systemvmuselocalstorage;
 					
-				$.cookie('sessionKey', g_sessionKey, { expires: 1});
-				$.cookie('networktype', g_networkType, { expires: 1});
-				$.cookie('hypervisortype', g_hypervisorType, { expires: 1});
-				$.cookie('username', g_username, { expires: 1});	
-				$.cookie('account', g_account, { expires: 1});	
-				$.cookie('domainid', g_domainid, { expires: 1});				
-				$.cookie('role', g_role, { expires: 1});
+				$.cookie('sessionKey', g_sessionKey, { expires: 1});
+				$.cookie('networktype', g_networkType, { expires: 1});
+				$.cookie('hypervisortype', g_hypervisorType, { expires: 1});
+				$.cookie('username', g_username, { expires: 1});	
+				$.cookie('account', g_account, { expires: 1});	
+				$.cookie('domainid', g_domainid, { expires: 1});				
+				$.cookie('role', g_role, { expires: 1});
 				$.cookie('timezoneoffset', g_timezoneoffset, { expires: 1});  
-				$.cookie('timezone', g_timezone, { expires: 1});  
+				$.cookie('timezone', g_timezone, { expires: 1});  
 				$.cookie('directattachnetworkgroupsenabled', g_directAttachNetworkGroupsEnabled, { expires: 1}); 
-				$.cookie('directattacheduntaggedenabled', g_directAttachedUntaggedEnabled, { expires: 1}); 
-				$.cookie('systemvmuselocalstorage', g_systemVmUseLocalStorage, { expires: 1}); 
-				
-				// Set Role
-				if (isUser()) {
-					$(".loginbutton_box p").text("").hide();			
-					$("#menutab_role_user #menutab_dashboard_user").click();
-				} else if (isAdmin()) {
-					$(".loginbutton_box p").text("").hide();			
-					$("#menutab_role_root #menutab_dashboard_root").click();
-				} else if (isDomainAdmin()) {
-					$(".loginbutton_box p").text("").hide();			
-					$("#menutab_role_domain #menutab_dashboard_domain").click();
-				} else {
-				    $(".loginbutton_box p").text("Account type of '" + username + "' is neither user nor admin.").show();
-				    return;
-				}				
-				
-				$("#logoutpage").hide();
-				$("body").css("background", "#FFF repeat top left");
+				$.cookie('directattacheduntaggedenabled', g_directAttachedUntaggedEnabled, { expires: 1}); 
+				$.cookie('systemvmuselocalstorage', g_systemVmUseLocalStorage, { expires: 1}); 
+				
+				// Set Role
+				if (isUser()) {
+					$(".loginbutton_box p").text("").hide();			
+					$("#menutab_role_user #menutab_dashboard_user").click();
+				} else if (isAdmin()) {
+					$(".loginbutton_box p").text("").hide();			
+					$("#menutab_role_root #menutab_dashboard_root").click();
+				} else if (isDomainAdmin()) {
+					$(".loginbutton_box p").text("").hide();			
+					$("#menutab_role_domain #menutab_dashboard_domain").click();
+				} else {
+				    $(".loginbutton_box p").text("Account type of '" + username + "' is neither user nor admin.").show();
+				    return;
+				}				
+				
+				$("#logoutpage").hide();
+				$("body").css("background", "#FFF repeat top left");
 				$("#mainmaster").show();	
-			},
-			error: function() {
-				$("#account_password").val("");
-				$("#logoutpage").show();				
-				$(".loginbutton_box p").text("Your username/password does not match our records.").show();
-				$("#account_username").focus();
-			},
-			beforeSend: function(XMLHttpRequest) {
-				return true;
-			}
-		});
-	}
-	
-	// Dialogs
-	$("#dialog_confirmation").dialog({ 
-		autoOpen: false,
-		modal: true,
-		zIndex: 2000
-	});
-	
-	$("#dialog_info").dialog({ 
-		autoOpen: false,
-		modal: true,
-		zIndex: 2000,
-		buttons: { "OK": function() { $(this).dialog("close"); } }
-	});
-	
-	$("#dialog_alert").dialog({ 
-		autoOpen: false,
-		modal: true,
-		zIndex: 2000,
-		buttons: { "OK": function() { $(this).dialog("close"); } }
-	});
-	$("#dialog_alert").siblings(".ui-widget-header").css("background", "url('/client/css/images/ui-bg_errorglass_30_ffffff_1x400.png') repeat-x scroll 50% 50% #393939");
-	$("#dialog_alert").siblings(".ui-dialog-buttonpane").find(".ui-state-default").css("background", "url('/client/css/images/ui-bg_errorglass_30_ffffff_1x400.png') repeat-x scroll 50% 50% #393939");
-	
-	$("#dialog_error").dialog({ 
-		autoOpen: false,
-		modal: true,
-		zIndex: 2000,
-		buttons: { "Close": function() { $(this).dialog("close"); } }
-	});
-	$("#dialog_error").siblings(".ui-widget-header").css("background", "url('/client/css/images/ui-bg_errorglass_30_ffffff_1x400.png') repeat-x scroll 50% 50% #393939");
-	$("#dialog_error").siblings(".ui-dialog-buttonpane").find(".ui-state-default").css("background", "url('/client/css/images/ui-bg_errorglass_30_ffffff_1x400.png') repeat-x scroll 50% 50% #393939");
-	
-	$("#dialog_session_expired").dialog({ 
-		autoOpen: false,
-		modal: true,
-		zIndex: 2000,
-		buttons: { "OK": function() { logout(true); $(this).dialog("close"); } }
-	});
-	$("#dialog_session_expired").siblings(".ui-widget-header").css("background", "url('/client/css/images/ui-bg_errorglass_30_ffffff_1x400.png') repeat-x scroll 50% 50% #393939");
-	$("#dialog_session_expired").siblings(".ui-dialog-buttonpane").find(".ui-state-default").css("background", "url('/client/css/images/ui-bg_errorglass_30_ffffff_1x400.png') repeat-x scroll 50% 50% #393939");
-			
-	$("#dialog_info_please_select_one_item_in_middle_menu").dialog({ 
-		autoOpen: false,
-		modal: true,
-		zIndex: 2000,
-		buttons: { "OK": function() { $(this).dialog("close"); } }
-	});
-	
-	/*
-	$("#dialog_server_error").dialog({ 
-		autoOpen: false,
-		modal: true,
-		zIndex: 2000,
-		buttons: { "OK": function() { $(this).dialog("close"); } }
-	});
-	$("#dialog_server_error").siblings(".ui-widget-header").css("background", "url('/client/css/images/ui-bg_errorglass_30_ffffff_1x400.png') repeat-x scroll 50% 50% #393939");
-	$("#dialog_server_error").siblings(".ui-dialog-buttonpane").find(".ui-state-default").css("background", "url('/client/css/images/ui-bg_errorglass_30_ffffff_1x400.png') repeat-x scroll 50% 50% #393939");
-	*/
-	
-	// Menu Tabs
-	$("#global_nav").bind("click", function(event) {
-		var tab = $(event.target);
-		var tabId = tab.attr("id");
-		var menuOnClass = "menutab_on";
-		var menuOffClass = "menutab_off";
-		if (tabId == "menutab_dashboard_user" || tabId == "menutab_dashboard_root" || tabId == "menutab_dashboard_domain") {
-			showDashboardTab();
-		} else if (tabId == "menutab_vm") {
-		    mainContainer.load("content/tab_instances.html", function() {
-			    showInstancesTab(tab.data("domainId"), tab.data("account"));	
-		    });		
-		} else if (tabId == "menutab_networking") {
-		    mainContainer.load("content/tab_networking.html", function() {
-		        showNetworkingTab(tab.data("domainId"), tab.data("account"));
-		    });	
-		} else if (tabId == "menutab_templates") {
-		    mainContainer.load("content/tab_templates.html", function() {
-			    showTemplatesTab();
-			});	
-		} else if (tabId == "menutab_events") {
-			mainContainer.load("content/tab_events.html", function() {			    
-			    showEventsTab(tab.data("showEvents"));
-			});
-		} else if (tabId == "menutab_hosts") {
-			mainContainer.load("content/tab_hosts.html", function() {		
-			    showHostsTab();
-			});
-	    } else if (tabId == "menutab_storage") {
-			mainContainer.load("content/tab_storage.html", function() {		
-			    showStorageTab(tab.data("domainId"), tab.data("targetTab"));
-			});
-		} else if (tabId == "menutab_accounts") {
-			mainContainer.load("content/tab_accounts.html", function() {	
-			    showAccountsTab(tab.data("domainId"));
-			});
-		} else if (tabId == "menutab_domain") {
-			mainContainer.load("jsp/tab_domains.jsp", function() {	   
-			    showDomainsTab();
-			});
-		} else if (tabId == "menutab_configuration") {
-			mainContainer.load("content/tab_configuration.html", function() {
-			    showConfigurationTab();
-			});
-		} else {
-			return false;
-		}
-		
-		if (isAdmin() || isDomainAdmin()) {
-			menuOnClass = "admin_menutab_on";
-			menuOffClass = "admin_menutab_off";
-		} else if (isUser()) {
-			menuOnClass = "menutab_on";
-			menuOffClass = "menutab_off";
-		}
-		if (activeTab != null) {
-			activeTab.removeClass(menuOnClass).addClass(menuOffClass); 
-		}
-		tab.removeClass(menuOffClass).addClass(menuOnClass);
-		activeTab = tab;
-		removeDialogs();
-		return false;
-	});
-	
-	// Dashboard Tab
-	function showDashboardTab() {
-		mainContainer.load("content/tab_dashboard.html", function() {
-			$(".header_topright #header_username").text($.cookie("username"));
-			
-			if (isAdmin()) {
-				var sessionExpired = false;
-				var zones = null;
-				var noZones = false;
-				var noPods = true;
-				$("#menutab_dashboard_root, #menutab_vm, #menutab_networking_old, #menutab_networking, #menutab_templates, #menutab_events, #menutab_hosts, #menutab_storage, #menutab_accounts, #menutab_domain").hide();							
-				$.ajax({
+			},
+			error: function() {
+				$("#account_password").val("");
+				$("#logoutpage").show();				
+				$(".loginbutton_box p").text("Your username/password does not match our records.").show();
+				$("#account_username").focus();
+			},
+			beforeSend: function(XMLHttpRequest) {
+				return true;
+			}
+		});
+	}
+	
+	// Dialogs
+	$("#dialog_confirmation").dialog({ 
+		autoOpen: false,
+		modal: true,
+		zIndex: 2000
+	});
+	
+	$("#dialog_info").dialog({ 
+		autoOpen: false,
+		modal: true,
+		zIndex: 2000,
+		buttons: { "OK": function() { $(this).dialog("close"); } }
+	});
+	
+	$("#dialog_alert").dialog({ 
+		autoOpen: false,
+		modal: true,
+		zIndex: 2000,
+		buttons: { "OK": function() { $(this).dialog("close"); } }
+	});
+	$("#dialog_alert").siblings(".ui-widget-header").css("background", "url('/client/css/images/ui-bg_errorglass_30_ffffff_1x400.png') repeat-x scroll 50% 50% #393939");
+	$("#dialog_alert").siblings(".ui-dialog-buttonpane").find(".ui-state-default").css("background", "url('/client/css/images/ui-bg_errorglass_30_ffffff_1x400.png') repeat-x scroll 50% 50% #393939");
+	
+	$("#dialog_error").dialog({ 
+		autoOpen: false,
+		modal: true,
+		zIndex: 2000,
+		buttons: { "Close": function() { $(this).dialog("close"); } }
+	});
+	$("#dialog_error").siblings(".ui-widget-header").css("background", "url('/client/css/images/ui-bg_errorglass_30_ffffff_1x400.png') repeat-x scroll 50% 50% #393939");
+	$("#dialog_error").siblings(".ui-dialog-buttonpane").find(".ui-state-default").css("background", "url('/client/css/images/ui-bg_errorglass_30_ffffff_1x400.png') repeat-x scroll 50% 50% #393939");
+	
+	$("#dialog_session_expired").dialog({ 
+		autoOpen: false,
+		modal: true,
+		zIndex: 2000,
+		buttons: { "OK": function() { logout(true); $(this).dialog("close"); } }
+	});
+	$("#dialog_session_expired").siblings(".ui-widget-header").css("background", "url('/client/css/images/ui-bg_errorglass_30_ffffff_1x400.png') repeat-x scroll 50% 50% #393939");
+	$("#dialog_session_expired").siblings(".ui-dialog-buttonpane").find(".ui-state-default").css("background", "url('/client/css/images/ui-bg_errorglass_30_ffffff_1x400.png') repeat-x scroll 50% 50% #393939");
+			
+	$("#dialog_info_please_select_one_item_in_middle_menu").dialog({ 
+		autoOpen: false,
+		modal: true,
+		zIndex: 2000,
+		buttons: { "OK": function() { $(this).dialog("close"); } }
+	});
+	
+	/*
+	$("#dialog_server_error").dialog({ 
+		autoOpen: false,
+		modal: true,
+		zIndex: 2000,
+		buttons: { "OK": function() { $(this).dialog("close"); } }
+	});
+	$("#dialog_server_error").siblings(".ui-widget-header").css("background", "url('/client/css/images/ui-bg_errorglass_30_ffffff_1x400.png') repeat-x scroll 50% 50% #393939");
+	$("#dialog_server_error").siblings(".ui-dialog-buttonpane").find(".ui-state-default").css("background", "url('/client/css/images/ui-bg_errorglass_30_ffffff_1x400.png') repeat-x scroll 50% 50% #393939");
+	*/
+	
+	// Menu Tabs
+	$("#global_nav").bind("click", function(event) {
+		var tab = $(event.target);
+		var tabId = tab.attr("id");
+		var menuOnClass = "menutab_on";
+		var menuOffClass = "menutab_off";
+		if (tabId == "menutab_dashboard_user" || tabId == "menutab_dashboard_root" || tabId == "menutab_dashboard_domain") {
+			showDashboardTab();
+		} else if (tabId == "menutab_vm") {
+		    mainContainer.load("content/tab_instances.html", function() {
+			    showInstancesTab(tab.data("domainId"), tab.data("account"));	
+		    });		
+		} else if (tabId == "menutab_networking") {
+		    mainContainer.load("content/tab_networking.html", function() {
+		        showNetworkingTab(tab.data("domainId"), tab.data("account"));
+		    });	
+		} else if (tabId == "menutab_templates") {
+		    mainContainer.load("content/tab_templates.html", function() {
+			    showTemplatesTab();
+			});	
+		} else if (tabId == "menutab_events") {
+			mainContainer.load("content/tab_events.html", function() {			    
+			    showEventsTab(tab.data("showEvents"));
+			});
+		} else if (tabId == "menutab_hosts") {
+			mainContainer.load("content/tab_hosts.html", function() {		
+			    showHostsTab();
+			});
+	    } else if (tabId == "menutab_storage") {
+			mainContainer.load("content/tab_storage.html", function() {		
+			    showStorageTab(tab.data("domainId"), tab.data("targetTab"));
+			});
+		} else if (tabId == "menutab_accounts") {
+			mainContainer.load("content/tab_accounts.html", function() {	
+			    showAccountsTab(tab.data("domainId"));
+			});
+		} else if (tabId == "menutab_domain") {
+			mainContainer.load("jsp/tab_domains.jsp", function() {	   
+			    showDomainsTab();
+			});
+		} else if (tabId == "menutab_configuration") {
+			mainContainer.load("content/tab_configuration.html", function() {
+			    showConfigurationTab();
+			});
+		} else {
+			return false;
+		}
+		
+		if (isAdmin() || isDomainAdmin()) {
+			menuOnClass = "admin_menutab_on";
+			menuOffClass = "admin_menutab_off";
+		} else if (isUser()) {
+			menuOnClass = "menutab_on";
+			menuOffClass = "menutab_off";
+		}
+		if (activeTab != null) {
+			activeTab.removeClass(menuOnClass).addClass(menuOffClass); 
+		}
+		tab.removeClass(menuOffClass).addClass(menuOnClass);
+		activeTab = tab;
+		removeDialogs();
+		return false;
+	});
+	
+	// Dashboard Tab
+	function showDashboardTab() {
+		mainContainer.load("content/tab_dashboard.html", function() {
+			$(".header_topright #header_username").text($.cookie("username"));
+			
+			if (isAdmin()) {
+				var sessionExpired = false;
+				var zones = null;
+				var noZones = false;
+				var noPods = true;
+				$("#menutab_dashboard_root, #menutab_vm, #menutab_networking_old, #menutab_networking, #menutab_templates, #menutab_events, #menutab_hosts, #menutab_storage, #menutab_accounts, #menutab_domain").hide();							
+				$.ajax({
 				        data: createURL("command=listZones&available=true&response=json"+maxPageSize),
-					dataType: "json",
-					async: false,
-					success: function(json) {
-						zones = json.listzonesresponse.zone;
-						var zoneSelect = $("#capacity_zone_select").empty();	
-						if (zones != null && zones.length > 0) {
-							for (var i = 0; i < zones.length; i++) {
-								zoneSelect.append("<option value='" + zones[i].id + "'>" + fromdb(zones[i].name) + "</option>"); 								
-								if(noPods) {
-								    $.ajax({
-								data: createURL("command=listPods&zoneId="+zones[i].id+"&response=json"),
-						                dataType: "json",
-						                async: false,
-						                success: function(json) {
-							                var pods = json.listpodsresponse.pod;						
-							                if (pods != null && pods.length > 0) {
-            							        noPods = false;
-            							        $("#menutab_dashboard_root, #menutab_vm, #menutab_networking_old, #menutab_networking, #menutab_templates, #menutab_events, #menutab_hosts, #menutab_storage, #menutab_accounts, #menutab_domain").show();							
-							                }							
-						                }
-					                });
-								}
-							}
-						} else {							
-							noZones = true;
-						}
-					},					
-					beforeSend: function(XMLHttpRequest) {
-						return true;
-					}	
-				});
-				if (sessionExpired) return false;
-				if (noZones || noPods) {
-					$("#tab_dashboard_user").hide();
-					$("#menutab_role_user").hide();
-					$("#menutab_role_root").show();
-					$("#menutab_configuration").click();
-					return false;
-				}
-				
-				var capacities = null;
-				$.ajax({
-					cache: false,
-					async: false,
-					data: createURL("command=listCapacity&response=json"),
-					dataType: "json",
-					success: function(json) {
-						capacities = json.listcapacityresponse.capacity;
-					}
-				});
-				
-				$("#capacity_pod_select").bind("change", function(event) {
-					// Reset to Defaults
-					$("#public_ip_total, #storage_total, #storage_alloc_total, #sec_storage_total, #memory_total, #cpu_total, #private_ip_total").text("N/A");
-					$("#public_ip_used, #storage_used, #storage_alloc, #sec_storage_used, #memory_used, #cpu_used, #private_ip_used,").attr("style", "width:50%").text("N/A");
-					$(".db_bargraph_barbox_safezone").attr("style", "width:0%");
-					$(".db_bargraph_barbox_unsafezone").attr("style", "width:0%");
+					dataType: "json",
+					async: false,
+					success: function(json) {
+						zones = json.listzonesresponse.zone;
+						var zoneSelect = $("#capacity_zone_select").empty();	
+						if (zones != null && zones.length > 0) {
+							for (var i = 0; i < zones.length; i++) {
+								zoneSelect.append("<option value='" + zones[i].id + "'>" + fromdb(zones[i].name) + "</option>"); 								
+								if(noPods) {
+								    $.ajax({
+								data: createURL("command=listPods&zoneId="+zones[i].id+"&response=json"),
+						                dataType: "json",
+						                async: false,
+						                success: function(json) {
+							                var pods = json.listpodsresponse.pod;						
+							                if (pods != null && pods.length > 0) {
+            							        noPods = false;
+            							        $("#menutab_dashboard_root, #menutab_vm, #menutab_networking_old, #menutab_networking, #menutab_templates, #menutab_events, #menutab_hosts, #menutab_storage, #menutab_accounts, #menutab_domain").show();							
+							                }							
+						                }
+					                });
+								}
+							}
+						} else {							
+							noZones = true;
+						}
+					},					
+					beforeSend: function(XMLHttpRequest) {
+						return true;
+					}	
+				});
+				if (sessionExpired) return false;
+				if (noZones || noPods) {
+					$("#tab_dashboard_user").hide();
+					$("#menutab_role_user").hide();
+					$("#menutab_role_root").show();
+					$("#menutab_configuration").click();
+					return false;
+				}
+				
+				var capacities = null;
+				$.ajax({
+					cache: false,
+					async: false,
+					data: createURL("command=listCapacity&response=json"),
+					dataType: "json",
+					success: function(json) {
+						capacities = json.listcapacityresponse.capacity;
+					}
+				});
+				
+				$("#capacity_pod_select").bind("change", function(event) {
+					// Reset to Defaults
+					$("#public_ip_total, #storage_total, #storage_alloc_total, #sec_storage_total, #memory_total, #cpu_total, #private_ip_total").text("N/A");
+					$("#public_ip_used, #storage_used, #storage_alloc, #sec_storage_used, #memory_used, #cpu_used, #private_ip_used,").attr("style", "width:50%").text("N/A");
+					$(".db_bargraph_barbox_safezone").attr("style", "width:0%");
+					$(".db_bargraph_barbox_unsafezone").attr("style", "width:0%");
 					
 					var selectedZone = $("#capacity_zone_select option:selected").text();
 					var selectedPod = $("#capacity_pod_select").val();
 					
-					if (capacities != null && capacities.length > 0) {
-						for (var i = 0; i < capacities.length; i++) {
-							var capacity = capacities[i];
-							if (capacity.zonename == selectedZone) {
-								// Public IPs
-								if (capacity.type == "4") {
-									$("#public_ip_used").attr("style", "width: " + ((parseFloat(capacity.percentused) < 50) ? "50%" : capacity.percentused + "%")).text("Used: " + capacity.capacityused + " / " + capacity.percentused + "%");
-									$("#public_ip_total").text("Total: " + capacity.capacitytotal);
-									var usedPercentage = parseInt(capacity.percentused);
-									if (usedPercentage > 70) {
-										$("#capacity_public_ip .db_bargraph_barbox_safezone").attr("style", "width:70%");
-										if(usedPercentage <= 100) 										
-										    $("#capacity_public_ip .db_bargraph_barbox_unsafezone").attr("style", "width:"+(usedPercentage - 70)+"%");
-										else 
-										    $("#capacity_public_ip .db_bargraph_barbox_unsafezone").attr("style", "width:30%");
-									} else {
-										$("#capacity_public_ip .db_bargraph_barbox_safezone").attr("style", "width:"+usedPercentage+"%");
-									    $("#capacity_public_ip .db_bargraph_barbox_unsafezone").attr("style", "width:0%");
-									}								
-								// Secondary Storage
-								} else if (capacity.type == "6") {
-									$("#sec_storage_used").attr("style", "width: " + ((parseFloat(capacity.percentused) < 50) ? "50%" : capacity.percentused + "%")).text("Used: " + convertBytes(parseInt(capacity.capacityused)) + " / " + capacity.percentused + "%");
-									$("#sec_storage_total").text("Total: " + convertBytes(parseInt(capacity.capacitytotal)));
-									var usedPercentage = parseInt(capacity.percentused);
-									if (usedPercentage > 70) {
-										$("#capacity_sec_storage .db_bargraph_barbox_safezone").attr("style", "width:70%");
-										if(usedPercentage <= 100) 
-										    $("#capacity_sec_storage .db_bargraph_barbox_unsafezone").attr("style", "width:"+(usedPercentage - 70)+"%");
-										else
-										    $("#capacity_sec_storage .db_bargraph_barbox_unsafezone").attr("style", "width:30%");
-									} else {
-										$("#capacity_sec_storage .db_bargraph_barbox_safezone").attr("style", "width:"+usedPercentage+"%");
-									    $("#capacity_sec_storage .db_bargraph_barbox_unsafezone").attr("style", "width:0%");
-									}
-								} else {
-									if (capacity.podname == selectedPod) {
-										// Memory
-										if (capacity.type == "0") {
-											$("#memory_used").attr("style", "width: " + ((parseFloat(capacity.percentused) < 50) ? "50%" : capacity.percentused + "%")).text("Used: " + convertBytes(parseInt(capacity.capacityused)) + " / " + capacity.percentused + "%");
-											$("#memory_total").text("Total: " + convertBytes(parseInt(capacity.capacitytotal)));
-											var usedPercentage = parseInt(capacity.percentused);
-											if (usedPercentage > 70) {
-												$("#capacity_memory .db_bargraph_barbox_safezone").attr("style", "width:70%");
-												if(usedPercentage <= 100) 
-												    $("#capacity_memory .db_bargraph_barbox_unsafezone").attr("style", "width:"+(usedPercentage - 70)+"%");
-												else
-												    $("#capacity_memory .db_bargraph_barbox_unsafezone").attr("style", "width:30%");
-											} else {
-												$("#capacity_memory .db_bargraph_barbox_safezone").attr("style", "width:"+usedPercentage+"%");
-											    $("#capacity_memory .db_bargraph_barbox_unsafezone").attr("style", "width:0%");
-											}
-										// CPU
-										} else if (capacity.type == "1") {
-											$("#cpu_used").attr("style", "width: " + ((parseFloat(capacity.percentused) < 50) ? "50%" : capacity.percentused + "%")).text("Used: " + convertHz(parseInt(capacity.capacityused)) + " / " + capacity.percentused + "%");
-											$("#cpu_total").text("Total: " + convertHz(parseInt(capacity.capacitytotal)));
-											var usedPercentage = parseInt(capacity.percentused);
-											if (usedPercentage > 70) {
-												$("#capacity_cpu .db_bargraph_barbox_safezone").attr("style", "width:70%");
-												if(usedPercentage <= 100) 
-												    $("#capacity_cpu .db_bargraph_barbox_unsafezone").attr("style", "width:"+(usedPercentage - 70)+"%");
-												else
-												    $("#capacity_cpu .db_bargraph_barbox_unsafezone").attr("style", "width:30%");
-											} else {
-												$("#capacity_cpu .db_bargraph_barbox_safezone").attr("style", "width:"+usedPercentage+"%");
-											    $("#capacity_cpu .db_bargraph_barbox_unsafezone").attr("style", "width:0%");
+					if (capacities != null && capacities.length > 0) {
+						for (var i = 0; i < capacities.length; i++) {
+							var capacity = capacities[i];
+							if (capacity.zonename == selectedZone) {
+								// Public IPs
+								if (capacity.type == "4") {
+									$("#public_ip_used").attr("style", "width: " + ((parseFloat(capacity.percentused) < 50) ? "50%" : capacity.percentused + "%")).text("Used: " + capacity.capacityused + " / " + capacity.percentused + "%");
+									$("#public_ip_total").text("Total: " + capacity.capacitytotal);
+									var usedPercentage = parseInt(capacity.percentused);
+									if (usedPercentage > 70) {
+										$("#capacity_public_ip .db_bargraph_barbox_safezone").attr("style", "width:70%");
+										if(usedPercentage <= 100) 										
+										    $("#capacity_public_ip .db_bargraph_barbox_unsafezone").attr("style", "width:"+(usedPercentage - 70)+"%");
+										else 
+										    $("#capacity_public_ip .db_bargraph_barbox_unsafezone").attr("style", "width:30%");
+									} else {
+										$("#capacity_public_ip .db_bargraph_barbox_safezone").attr("style", "width:"+usedPercentage+"%");
+									    $("#capacity_public_ip .db_bargraph_barbox_unsafezone").attr("style", "width:0%");
+									}								
+								// Secondary Storage
+								} else if (capacity.type == "6") {
+									$("#sec_storage_used").attr("style", "width: " + ((parseFloat(capacity.percentused) < 50) ? "50%" : capacity.percentused + "%")).text("Used: " + convertBytes(parseInt(capacity.capacityused)) + " / " + capacity.percentused + "%");
+									$("#sec_storage_total").text("Total: " + convertBytes(parseInt(capacity.capacitytotal)));
+									var usedPercentage = parseInt(capacity.percentused);
+									if (usedPercentage > 70) {
+										$("#capacity_sec_storage .db_bargraph_barbox_safezone").attr("style", "width:70%");
+										if(usedPercentage <= 100) 
+										    $("#capacity_sec_storage .db_bargraph_barbox_unsafezone").attr("style", "width:"+(usedPercentage - 70)+"%");
+										else
+										    $("#capacity_sec_storage .db_bargraph_barbox_unsafezone").attr("style", "width:30%");
+									} else {
+										$("#capacity_sec_storage .db_bargraph_barbox_safezone").attr("style", "width:"+usedPercentage+"%");
+									    $("#capacity_sec_storage .db_bargraph_barbox_unsafezone").attr("style", "width:0%");
+									}
+								} else {
+									if (capacity.podname == selectedPod) {
+										// Memory
+										if (capacity.type == "0") {
+											$("#memory_used").attr("style", "width: " + ((parseFloat(capacity.percentused) < 50) ? "50%" : capacity.percentused + "%")).text("Used: " + convertBytes(parseInt(capacity.capacityused)) + " / " + capacity.percentused + "%");
+											$("#memory_total").text("Total: " + convertBytes(parseInt(capacity.capacitytotal)));
+											var usedPercentage = parseInt(capacity.percentused);
+											if (usedPercentage > 70) {
+												$("#capacity_memory .db_bargraph_barbox_safezone").attr("style", "width:70%");
+												if(usedPercentage <= 100) 
+												    $("#capacity_memory .db_bargraph_barbox_unsafezone").attr("style", "width:"+(usedPercentage - 70)+"%");
+												else
+												    $("#capacity_memory .db_bargraph_barbox_unsafezone").attr("style", "width:30%");
+											} else {
+												$("#capacity_memory .db_bargraph_barbox_safezone").attr("style", "width:"+usedPercentage+"%");
+											    $("#capacity_memory .db_bargraph_barbox_unsafezone").attr("style", "width:0%");
+											}
+										// CPU
+										} else if (capacity.type == "1") {
+											$("#cpu_used").attr("style", "width: " + ((parseFloat(capacity.percentused) < 50) ? "50%" : capacity.percentused + "%")).text("Used: " + convertHz(parseInt(capacity.capacityused)) + " / " + capacity.percentused + "%");
+											$("#cpu_total").text("Total: " + convertHz(parseInt(capacity.capacitytotal)));
+											var usedPercentage = parseInt(capacity.percentused);
+											if (usedPercentage > 70) {
+												$("#capacity_cpu .db_bargraph_barbox_safezone").attr("style", "width:70%");
+												if(usedPercentage <= 100) 
+												    $("#capacity_cpu .db_bargraph_barbox_unsafezone").attr("style", "width:"+(usedPercentage - 70)+"%");
+												else
+												    $("#capacity_cpu .db_bargraph_barbox_unsafezone").attr("style", "width:30%");
+											} else {
+												$("#capacity_cpu .db_bargraph_barbox_safezone").attr("style", "width:"+usedPercentage+"%");
+											    $("#capacity_cpu .db_bargraph_barbox_unsafezone").attr("style", "width:0%");
 											}
 										// Storage Used
 										} else if (capacity.type == "2") {
@@ -681,296 +667,296 @@ $(document).ready(function() {
 											} else {
 												$("#capacity_storage_alloc .db_bargraph_barbox_safezone").attr("style", "width:"+usedPercentage+"%");
 											    $("#capacity_storage_alloc .db_bargraph_barbox_unsafezone").attr("style", "width:0%");
-											}
-										// Private IPs
-										} else if (capacity.type == "5") {
-											$("#private_ip_used").attr("style", "width: " + ((parseFloat(capacity.percentused) < 50) ? "50%" : capacity.percentused + "%")).text("Used: " + capacity.capacityused + " / " + capacity.percentused + "%");
-											$("#private_ip_total").text("Total: " + capacity.capacitytotal);
-											var usedPercentage = parseInt(capacity.percentused);
-											if (usedPercentage > 70) {
-												$("#capacity_private_ip .db_bargraph_barbox_safezone").attr("style", "width:70%");
-												if(usedPercentage <= 100) 
-												    $("#capacity_private_ip .db_bargraph_barbox_unsafezone").attr("style", "width:"+(usedPercentage - 70)+"%");
-												else
-												    $("#capacity_private_ip .db_bargraph_barbox_unsafezone").attr("style", "width:30%");
-											} else {
-												$("#capacity_private_ip .db_bargraph_barbox_safezone").attr("style", "width:"+usedPercentage+"%");
-											    $("#capacity_private_ip .db_bargraph_barbox_unsafezone").attr("style", "width:0%");
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				});
-				
-				$("#capacity_zone_select").bind("change", function(event) {
-					var zoneId = $(this).val();
-					$.ajax({
+											}
+										// Private IPs
+										} else if (capacity.type == "5") {
+											$("#private_ip_used").attr("style", "width: " + ((parseFloat(capacity.percentused) < 50) ? "50%" : capacity.percentused + "%")).text("Used: " + capacity.capacityused + " / " + capacity.percentused + "%");
+											$("#private_ip_total").text("Total: " + capacity.capacitytotal);
+											var usedPercentage = parseInt(capacity.percentused);
+											if (usedPercentage > 70) {
+												$("#capacity_private_ip .db_bargraph_barbox_safezone").attr("style", "width:70%");
+												if(usedPercentage <= 100) 
+												    $("#capacity_private_ip .db_bargraph_barbox_unsafezone").attr("style", "width:"+(usedPercentage - 70)+"%");
+												else
+												    $("#capacity_private_ip .db_bargraph_barbox_unsafezone").attr("style", "width:30%");
+											} else {
+												$("#capacity_private_ip .db_bargraph_barbox_safezone").attr("style", "width:"+usedPercentage+"%");
+											    $("#capacity_private_ip .db_bargraph_barbox_unsafezone").attr("style", "width:0%");
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+				});
+				
+				$("#capacity_zone_select").bind("change", function(event) {
+					var zoneId = $(this).val();
+					$.ajax({
 					        data: createURL("command=listPods&zoneId="+zoneId+"&response=json"+maxPageSize),
-						dataType: "json",
-						async: false,
-						success: function(json) {
-							var pods = json.listpodsresponse.pod;
-							var podSelect = $("#capacity_pod_select").empty();	
+						dataType: "json",
+						async: false,
+						success: function(json) {
+							var pods = json.listpodsresponse.pod;
+							var podSelect = $("#capacity_pod_select").empty();	
 							if (pods != null && pods.length > 0) {
-								podSelect.append("<option value='All'>All</option>"); 
-							    for (var i = 0; i < pods.length; i++) {
-								    podSelect.append("<option value='" + pods[i].name + "'>" + fromdb(pods[i].name) + "</option>"); 
-							    }
-							}
-							$("#capacity_pod_select").change();
-						}
-					});
-				});
-				$("#capacity_zone_select").change();
-				
-				// Show Recent Alerts
-				$.ajax({
-				        data: createURL("command=listAlerts&response=json"),
-					dataType: "json",
-					success: function(json) {
-						var alerts = json.listalertsresponse.alert;
-						if (alerts != null && alerts.length > 0) {
-							var alertGrid = $("#alert_grid_content").empty();
-							var length = (alerts.length>=5) ? 5 : alerts.length;
-							for (var i = 0; i < length; i++) {
-								var errorTemplate = $("#recent_error_template").clone(true);
-								errorTemplate.find("#db_error_type").text(toAlertType(alerts[i].type));
-								errorTemplate.find("#db_error_msg").append(fromdb(alerts[i].description));											
-								setDateField(alerts[i].sent, errorTemplate.find("#db_error_date"));															
-								alertGrid.append(errorTemplate.show());
-							}
-						}
-					}
-				});
-				
-				// Show Host Alerts
-				$.ajax({
-				        data: createURL("command=listHosts&state=Alert&response=json"),
-					dataType: "json",
-					success: function(json) {
-						var alerts = json.listhostsresponse.host;
-						if (alerts != null && alerts.length > 0) {
-							var alertGrid = $("#host_alert_grid_content").empty();
-							var length = (alerts.length>=4) ? 4 : alerts.length;
-							for (var i = 0; i < length; i++) {
-								var errorTemplate = $("#recent_error_template").clone(true);
-								errorTemplate.find("#db_error_type").text("Host - Alert State");
-								errorTemplate.find("#db_error_msg").append("Host - <b>" + fromdb(alerts[i].name) + "</b> has been detected in Alert state.");								
-								setDateField(alerts[i].disconnected, errorTemplate.find("#db_error_date"));											
-								alertGrid.append(errorTemplate.show());
-							}
-						}
-					}
-				});
-				
-				$("#alert_more").bind("click", function(event) {
-					event.preventDefault();
-					
-					$("#menutab_role_root #menutab_events").data("showEvents", false).click();
-				});
-				$("#host_alert_more").bind("click", function(event) {
-					event.preventDefault();
-					$("#menutab_hosts").click();
-				});
-				
-				$("#tab_dashboard_user, #tab_dashboard_domain, #loading_gridtable").hide();
-				$("#tab_dashboard_root").show();
-				$("#menutab_role_user").hide();
-				$("#menutab_role_root").show();
-				$("#menutab_role_domain").hide();
-				$("#launch_test").show();
-			} else if (isDomainAdmin()) {
-				var thisTab = $("#tab_dashboard_domain");
-				$("#tab_dashboard_user, #tab_dashboard_root, #loading_gridtable").hide();
-				thisTab.show();
-				$("#menutab_role_user").hide();
-				$("#menutab_role_root").hide();
-				$("#menutab_role_domain").show();
-				$("#launch_test").hide();
-				
-				// Need to use/create better API for this as there is a limit of pageSize
-				// to list count.
-				$.ajax({
+								podSelect.append("<option value='All'>All</option>"); 
+							    for (var i = 0; i < pods.length; i++) {
+								    podSelect.append("<option value='" + pods[i].name + "'>" + fromdb(pods[i].name) + "</option>"); 
+							    }
+							}
+							$("#capacity_pod_select").change();
+						}
+					});
+				});
+				$("#capacity_zone_select").change();
+				
+				// Show Recent Alerts
+				$.ajax({
+				        data: createURL("command=listAlerts&response=json"),
+					dataType: "json",
+					success: function(json) {
+						var alerts = json.listalertsresponse.alert;
+						if (alerts != null && alerts.length > 0) {
+							var alertGrid = $("#alert_grid_content").empty();
+							var length = (alerts.length>=5) ? 5 : alerts.length;
+							for (var i = 0; i < length; i++) {
+								var errorTemplate = $("#recent_error_template").clone(true);
+								errorTemplate.find("#db_error_type").text(toAlertType(alerts[i].type));
+								errorTemplate.find("#db_error_msg").append(fromdb(alerts[i].description));											
+								setDateField(alerts[i].sent, errorTemplate.find("#db_error_date"));															
+								alertGrid.append(errorTemplate.show());
+							}
+						}
+					}
+				});
+				
+				// Show Host Alerts
+				$.ajax({
+				        data: createURL("command=listHosts&state=Alert&response=json"),
+					dataType: "json",
+					success: function(json) {
+						var alerts = json.listhostsresponse.host;
+						if (alerts != null && alerts.length > 0) {
+							var alertGrid = $("#host_alert_grid_content").empty();
+							var length = (alerts.length>=4) ? 4 : alerts.length;
+							for (var i = 0; i < length; i++) {
+								var errorTemplate = $("#recent_error_template").clone(true);
+								errorTemplate.find("#db_error_type").text("Host - Alert State");
+								errorTemplate.find("#db_error_msg").append("Host - <b>" + fromdb(alerts[i].name) + "</b> has been detected in Alert state.");								
+								setDateField(alerts[i].disconnected, errorTemplate.find("#db_error_date"));											
+								alertGrid.append(errorTemplate.show());
+							}
+						}
+					}
+				});
+				
+				$("#alert_more").bind("click", function(event) {
+					event.preventDefault();
+					
+					$("#menutab_role_root #menutab_events").data("showEvents", false).click();
+				});
+				$("#host_alert_more").bind("click", function(event) {
+					event.preventDefault();
+					$("#menutab_hosts").click();
+				});
+				
+				$("#tab_dashboard_user, #tab_dashboard_domain, #loading_gridtable").hide();
+				$("#tab_dashboard_root").show();
+				$("#menutab_role_user").hide();
+				$("#menutab_role_root").show();
+				$("#menutab_role_domain").hide();
+				$("#launch_test").show();
+			} else if (isDomainAdmin()) {
+				var thisTab = $("#tab_dashboard_domain");
+				$("#tab_dashboard_user, #tab_dashboard_root, #loading_gridtable").hide();
+				thisTab.show();
+				$("#menutab_role_user").hide();
+				$("#menutab_role_root").hide();
+				$("#menutab_role_domain").show();
+				$("#launch_test").hide();
+				
+				// Need to use/create better API for this as there is a limit of pageSize
+				// to list count.
+				$.ajax({
 				        data: createURL("command=listVirtualMachines&response=json"+maxPageSize),
-					dataType: "json",
-					success: function(json) {
-						if (json.listvirtualmachinesresponse.virtualmachine != undefined)
-							thisTab.find("#dashboard_instances").text(json.listvirtualmachinesresponse.virtualmachine.length);
-					}
-				});
-				$.ajax({
+					dataType: "json",
+					success: function(json) {
+						if (json.listvirtualmachinesresponse.virtualmachine != undefined)
+							thisTab.find("#dashboard_instances").text(json.listvirtualmachinesresponse.virtualmachine.length);
+					}
+				});
+				$.ajax({
 				        data: createURL("command=listVolumes&response=json"+maxPageSize),
-					dataType: "json",
-					success: function(json) {
-						if (json.listvolumesresponse.volume)
-							thisTab.find("#dashboard_volumes").text(json.listvolumesresponse.volume.length);
-					}
-				});
-				$.ajax({
+					dataType: "json",
+					success: function(json) {
+						if (json.listvolumesresponse.volume)
+							thisTab.find("#dashboard_volumes").text(json.listvolumesresponse.volume.length);
+					}
+				});
+				$.ajax({
 				        data: createURL("command=listSnapshots&response=json"+maxPageSize),
-					dataType: "json",
-					success: function(json) {
-						if (json.listsnapshotsresponse.snapshot)
-							thisTab.find("#dashboard_snapshots").text(json.listsnapshotsresponse.snapshot.length);
-					}
-				});
-				$.ajax({
+					dataType: "json",
+					success: function(json) {
+						if (json.listsnapshotsresponse.snapshot)
+							thisTab.find("#dashboard_snapshots").text(json.listsnapshotsresponse.snapshot.length);
+					}
+				});
+				$.ajax({
 				        data: createURL("command=listAccounts&response=json"+maxPageSize),
-					dataType: "json",
-					success: function(json) {
-						if (json.listaccountsresponse.account)
-							thisTab.find("#dashboard_accounts").text(json.listaccountsresponse.account.length);
-					}
-				});
-				$.ajax({
-				        data: createURL("command=listEvents&level=ERROR&response=json"),
-					dataType: "json",
-					success: function(json) {
-						var events = json.listeventsresponse.event;
-						if (events != null && events.length > 0) {
-							var errorGrid = thisTab.find("#error_grid_content").empty();
-							var length = (events.length>=3) ? 3 : events.length;
-							for (var i = 0; i < length; i++) {
-								var errorTemplate = $("#recent_error_template").clone(true);
-								errorTemplate.find("#db_error_type").text(events[i].type);
-								errorTemplate.find("#db_error_msg").text(fromdb(events[i].description));								
-								setDateField(events[i].created, errorTemplate.find("#db_error_date"));																
-								errorGrid.append(errorTemplate.show());
-							}
-						}
-					}
-				});
-			} else if(isUser()) {			    
-			    $("#launch_test").hide();
-				$.ajax({
-					cache: false,
-					data: createURL("command=listAccounts&response=json"),
-					dataType: "json",
-					success: function(json) {
-					    var accounts = json.listaccountsresponse.account;						
-						if (accounts != null && accounts.length > 0) {
-						    var statJSON = accounts[0];
-						    var sent = parseInt(statJSON.sentbytes);
-						    var rec = parseInt(statJSON.receivedbytes);
-    						
-    						if(sent==0 && rec==0)
-    						    $("#network_bandwidth_panel").hide();
-    						else
-    						    $("#network_bandwidth_panel").show();
-    						
-						    $("#menutab_role_user").show();
-						    $("#menutab_role_root").hide();
-							$("#menutab_role_domain").hide();
-						    $("#tab_dashboard_user").show();
-						    $("#tab_dashboard_root, #tab_dashboard_domain, #loading_gridtable").hide();
-							
-						    // This is in bytes, so let's change to KB
-						    sent = Math.round(sent / 1024);
-						    rec = Math.round(rec / 1024);
-						    $("#db_sent").text(sent + "KB");
-						    $("#db_received").text(rec + "KB");
-						    $("#db_available_public_ips").text(statJSON.ipavailable);
-						    $("#db_owned_public_ips").text(statJSON.iptotal);
-						    $("#db_running_vms").text(statJSON.vmrunning + " VM(s)");
-						    $("#db_stopped_vms").text(statJSON.vmstopped + " VM(s)");
-						    $("#db_total_vms").text(statJSON.vmtotal + " VM(s)");
-						    $("#db_avail_vms").text(statJSON.vmavailable + " VM(s)");						   
-						    $("#db_account_id").text(statJSON.id);
-						    $("#db_account").text(statJSON.name);						    
-						    $("#db_type").text(toRole(statJSON.accounttype));
-						    $("#db_domain").text(statJSON.domain);						    			   
-						}
-						
-						// Events
-						$.ajax({
-						        data: createURL("command=listEvents&level=ERROR&response=json"),
-							dataType: "json",
-							success: function(json) {
-								var events = json.listeventsresponse.event;
-								if (events != null && events.length > 0) {
-									var errorGrid = $("#error_grid_content").empty();
-									var length = (events.length>=3) ? 3 : events.length;
-									for (var i = 0; i < length; i++) {
-										var errorTemplate = $("#recent_error_template").clone(true);
-										errorTemplate.find("#db_error_type").text(events[i].type);
-										errorTemplate.find("#db_error_msg").text(fromdb(events[i].description));										
-										setDateField(events[i].created, errorTemplate.find("#db_error_date"));									
-										errorGrid.append(errorTemplate.show());
-									}
-								}
-							}
-						});
-					},					
-					beforeSend: function(XMLHttpRequest) {
-						return true;
-					}	
-				});
-			} else { //no role 
-			    logout(false);
-			    return;
-			}
-		});
-	}
-
-	// Check whether the session is valid.
-	g_mySession = $.cookie("JSESSIONID");
-	g_sessionKey = $.cookie("sessionKey");
-	g_role = $.cookie("role");
-	g_username = $.cookie("username");
-	g_account = $.cookie("account");
-	g_domainid = $.cookie("domainid");
-	g_networkType = $.cookie("networktype");
+					dataType: "json",
+					success: function(json) {
+						if (json.listaccountsresponse.account)
+							thisTab.find("#dashboard_accounts").text(json.listaccountsresponse.account.length);
+					}
+				});
+				$.ajax({
+				        data: createURL("command=listEvents&level=ERROR&response=json"),
+					dataType: "json",
+					success: function(json) {
+						var events = json.listeventsresponse.event;
+						if (events != null && events.length > 0) {
+							var errorGrid = thisTab.find("#error_grid_content").empty();
+							var length = (events.length>=3) ? 3 : events.length;
+							for (var i = 0; i < length; i++) {
+								var errorTemplate = $("#recent_error_template").clone(true);
+								errorTemplate.find("#db_error_type").text(events[i].type);
+								errorTemplate.find("#db_error_msg").text(fromdb(events[i].description));								
+								setDateField(events[i].created, errorTemplate.find("#db_error_date"));																
+								errorGrid.append(errorTemplate.show());
+							}
+						}
+					}
+				});
+			} else if(isUser()) {			    
+			    $("#launch_test").hide();
+				$.ajax({
+					cache: false,
+					data: createURL("command=listAccounts&response=json"),
+					dataType: "json",
+					success: function(json) {
+					    var accounts = json.listaccountsresponse.account;						
+						if (accounts != null && accounts.length > 0) {
+						    var statJSON = accounts[0];
+						    var sent = parseInt(statJSON.sentbytes);
+						    var rec = parseInt(statJSON.receivedbytes);
+    						
+    						if(sent==0 && rec==0)
+    						    $("#network_bandwidth_panel").hide();
+    						else
+    						    $("#network_bandwidth_panel").show();
+    						
+						    $("#menutab_role_user").show();
+						    $("#menutab_role_root").hide();
+							$("#menutab_role_domain").hide();
+						    $("#tab_dashboard_user").show();
+						    $("#tab_dashboard_root, #tab_dashboard_domain, #loading_gridtable").hide();
+							
+						    // This is in bytes, so let's change to KB
+						    sent = Math.round(sent / 1024);
+						    rec = Math.round(rec / 1024);
+						    $("#db_sent").text(sent + "KB");
+						    $("#db_received").text(rec + "KB");
+						    $("#db_available_public_ips").text(statJSON.ipavailable);
+						    $("#db_owned_public_ips").text(statJSON.iptotal);
+						    $("#db_running_vms").text(statJSON.vmrunning + " VM(s)");
+						    $("#db_stopped_vms").text(statJSON.vmstopped + " VM(s)");
+						    $("#db_total_vms").text(statJSON.vmtotal + " VM(s)");
+						    $("#db_avail_vms").text(statJSON.vmavailable + " VM(s)");						   
+						    $("#db_account_id").text(statJSON.id);
+						    $("#db_account").text(statJSON.name);						    
+						    $("#db_type").text(toRole(statJSON.accounttype));
+						    $("#db_domain").text(statJSON.domain);						    			   
+						}
+						
+						// Events
+						$.ajax({
+						        data: createURL("command=listEvents&level=ERROR&response=json"),
+							dataType: "json",
+							success: function(json) {
+								var events = json.listeventsresponse.event;
+								if (events != null && events.length > 0) {
+									var errorGrid = $("#error_grid_content").empty();
+									var length = (events.length>=3) ? 3 : events.length;
+									for (var i = 0; i < length; i++) {
+										var errorTemplate = $("#recent_error_template").clone(true);
+										errorTemplate.find("#db_error_type").text(events[i].type);
+										errorTemplate.find("#db_error_msg").text(fromdb(events[i].description));										
+										setDateField(events[i].created, errorTemplate.find("#db_error_date"));									
+										errorGrid.append(errorTemplate.show());
+									}
+								}
+							}
+						});
+					},					
+					beforeSend: function(XMLHttpRequest) {
+						return true;
+					}	
+				});
+			} else { //no role 
+			    logout(false);
+			    return;
+			}
+		});
+	}
+
+	// Check whether the session is valid.
+	g_mySession = $.cookie("JSESSIONID");
+	g_sessionKey = $.cookie("sessionKey");
+	g_role = $.cookie("role");
+	g_username = $.cookie("username");
+	g_account = $.cookie("account");
+	g_domainid = $.cookie("domainid");
+	g_networkType = $.cookie("networktype");
 	g_hypervisorType = $.cookie("hypervisortype");
-	g_timezone = $.cookie("timezone");
+	g_timezone = $.cookie("timezone");
 	g_directAttachNetworkGroupsEnabled = $.cookie("directattachnetworkgroupsenabled");
-	g_directAttachedUntaggedEnabled = $.cookie("directattacheduntaggedenabled");
-	g_systemVmUseLocalStorage = $.cookie("systemvmuselocalstorage");
-	
-	if($.cookie("timezoneoffset") != null)
-	    g_timezoneoffset = isNaN($.cookie("timezoneoffset"))?null: parseFloat($.cookie("timezoneoffset"));
-	else
-	    g_timezoneoffset = null;
-	    
-	if (!g_networkType || g_networkType.length == 0) 		
-		g_networkType = "vnet";
-	
-	if (!g_hypervisorType || g_hypervisorType.length == 0) 		
-		g_hypervisorType = "kvm";
-	
-	if (!g_directAttachNetworkGroupsEnabled || g_directAttachNetworkGroupsEnabled.length == 0) 		
+	g_directAttachedUntaggedEnabled = $.cookie("directattacheduntaggedenabled");
+	g_systemVmUseLocalStorage = $.cookie("systemvmuselocalstorage");
+	
+	if($.cookie("timezoneoffset") != null)
+	    g_timezoneoffset = isNaN($.cookie("timezoneoffset"))?null: parseFloat($.cookie("timezoneoffset"));
+	else
+	    g_timezoneoffset = null;
+	    
+	if (!g_networkType || g_networkType.length == 0) 		
+		g_networkType = "vnet";
+	
+	if (!g_hypervisorType || g_hypervisorType.length == 0) 		
+		g_hypervisorType = "kvm";
+	
+	if (!g_directAttachNetworkGroupsEnabled || g_directAttachNetworkGroupsEnabled.length == 0) 		
 		g_directAttachNetworkGroupsEnabled = "false";	
 		
 	if (!g_directAttachedUntaggedEnabled || g_directAttachedUntaggedEnabled.length == 0) 		
-		g_directAttachedUntaggedEnabled = "false";		
-	
-	if (!g_systemVmUseLocalStorage || g_systemVmUseLocalStorage.length == 0) 		
-		g_systemVmUseLocalStorage = "false";
-		
-	$.ajax({
-	        data: createURL("command=listZones&available=true&response=json"),
-		dataType: "json",
-		async: false,
-		success: function(json) {
-			// session is valid, continue
-			if (isUser()) {
-				$("#menutab_role_user #menutab_dashboard_user").click();
-			} else if (isAdmin()) {
-				$("#menutab_role_root #menutab_dashboard_root").click();
-			} else if (isDomainAdmin()) {
-				$("#menutab_role_domain #menutab_dashboard_domain").click();
-			} else {
-				logout(false);
-			}
-		},
-		error: function(xmlHTTP) {
-			logout(false);
-		},
-		beforeSend: function(xmlHTTP) {
-			return true;
-		}
-	});
-});
-
+		g_directAttachedUntaggedEnabled = "false";		
+	
+	if (!g_systemVmUseLocalStorage || g_systemVmUseLocalStorage.length == 0) 		
+		g_systemVmUseLocalStorage = "false";
+		
+	$.ajax({
+	        data: createURL("command=listZones&available=true&response=json"),
+		dataType: "json",
+		async: false,
+		success: function(json) {
+			// session is valid, continue
+			if (isUser()) {
+				$("#menutab_role_user #menutab_dashboard_user").click();
+			} else if (isAdmin()) {
+				$("#menutab_role_root #menutab_dashboard_root").click();
+			} else if (isDomainAdmin()) {
+				$("#menutab_role_domain #menutab_dashboard_domain").click();
+			} else {
+				logout(false);
+			}
+		},
+		error: function(xmlHTTP) {
+			logout(false);
+		},
+		beforeSend: function(xmlHTTP) {
+			return true;
+		}
+	});
+});
+
diff --git a/ui/new/scripts/cloud.core2.instance.js b/ui/new/scripts/cloud.core2.instance.js
index 860d685d10c..9ed5b5b2e6e 100644
--- a/ui/new/scripts/cloud.core2.instance.js
+++ b/ui/new/scripts/cloud.core2.instance.js
@@ -47,8 +47,8 @@ function clickInstanceGroupHeader($arrowIcon) {
         initDialog("dialog_create_template", 400);  
 	
         //***** switch between different tabs (begin) ********************************************************************
-        var tabArray = ["tab_details", "tab_volume", "tab_statistics", "tab_router"];
-        var tabContentArray = ["tab_content_details", "tab_content_volume", "tab_content_statistics", "tab_content_router"];
+        var tabArray = [$("#tab_details"), $("#tab_volume"), $("#tab_statistics"), $("#tab_router")];
+        var tabContentArray = [$("#tab_content_details"), $("#tab_content_volume"), $("#tab_content_statistics"), $("#tab_content_router")];
         switchBetweenDifferentTabs(tabArray, tabContentArray);       
         //***** switch between different tabs (end) **********************************************************************
         
diff --git a/ui/new/scripts/cloud.core2.ipaddress.js b/ui/new/scripts/cloud.core2.ipaddress.js
index eb7a04cd702..f4c143ec02c 100644
--- a/ui/new/scripts/cloud.core2.ipaddress.js
+++ b/ui/new/scripts/cloud.core2.ipaddress.js
@@ -1,8 +1,8 @@
 //***** baseline (begin) *******************************************************************************************************************
 function afterLoadIpJSP() {
     //***** switch between different tabs (begin) ********************************************************************
-    var tabArray = ["tab_details", "tab_port_forwarding", "tab_load_balancer"];
-    var tabContentArray = ["tab_content_details", "tab_content_port_forwarding", "tab_content_load_balancer"];
+    var tabArray = [$("#tab_details"), $("#tab_port_forwarding"), $("#tab_load_balancer")];
+    var tabContentArray = [$("#tab_content_details"), $("#tab_content_port_forwarding"), $("#tab_content_load_balancer")];
     switchBetweenDifferentTabs(tabArray, tabContentArray);       
     //***** switch between different tabs (end) **********************************************************************
         
diff --git a/ui/new/scripts/cloud.core2.js b/ui/new/scripts/cloud.core2.js
index ae5984db1ba..927355c91c9 100644
--- a/ui/new/scripts/cloud.core2.js
+++ b/ui/new/scripts/cloud.core2.js
@@ -585,17 +585,17 @@ function switchBetweenDifferentTabs(tabArray, tabContentArray) {
 }
 
 function switchToTab(tabIndex, tabArray, tabContentArray) {
-  $("#"+tabArray[tabIndex]).bind("click", function(event){               
-        $("#"+tabArray[tabIndex]).removeClass("off").addClass("on"); //current tab turns on
+  tabArray[tabIndex].bind("click", function(event){               
+        tabArray[tabIndex].removeClass("off").addClass("on"); //current tab turns on
         for(var k=0; k<tabArray.length; k++) { 
             if(k != tabIndex)
-                $("#"+tabArray[k]).removeClass("on").addClass("off");  //other tabs turns off
+                tabArray[k].removeClass("on").addClass("off");  //other tabs turns off
         }                    
                         
-        $("#"+tabContentArray[tabIndex]).show();    //current tab content shows             
+        tabContentArray[tabIndex].show();    //current tab content shows             
         for(var k=0; k<tabContentArray.length; k++) {
             if(k != tabIndex)
-                $("#"+tabContentArray[k]).hide();   //other tab content hide
+                tabContentArray[k].hide();   //other tab content hide
         }   
         return false;
     });   
diff --git a/ui/new/scripts/cloud.core2.resource.js b/ui/new/scripts/cloud.core2.resource.js
index d225a4dda40..3913b88a9de 100644
--- a/ui/new/scripts/cloud.core2.resource.js
+++ b/ui/new/scripts/cloud.core2.resource.js
@@ -1,10 +1,24 @@
 function afterLoadResourceJSP() {
-    //***** switch between different tabs (begin) ********************************************************************
-    var tabArray = ["tab_details", "tab_network", "tab_secondary_storage"];
-    var tabContentArray = ["tab_content_details", "tab_content_network", "tab_content_secondary_storage"];
-    switchBetweenDifferentTabs(tabArray, tabContentArray);       
-    //***** switch between different tabs (end) **********************************************************************
-  
+    var $rightPanelConent = $("#right_panel_content");
+    var $zonePage = $rightPanelConent.find("#zone_page");
+    var $podPage = $rightPanelConent.find("#pod_page");
+    var $clusterPage = $rightPanelConent.find("#cluster_page");
+    var $hostPage = $rightPanelConent.find("#host_page");
+    var $primarystoragePage = $rightPanelConent.find("#primarystorage_page");
+    var $systemvmPage = $rightPanelConent.find("#systemvm_page");
+    
+    var pageArray = [$zonePage, $podPage, $clusterPage, $hostPage, $primarystoragePage, $systemvmPage];
+    
+    function showPage($pageToShow) {        
+        for(var i=0; i<pageArray.length; i++) {
+            if(pageArray[i].attr("id") == $pageToShow.attr("id"))
+                pageArray[i].show();
+            else
+                pageArray[i].hide();
+        }            
+    }
+   
+    //***** build zone tree (begin) ***********************************************************************************************
     var forceLogout = true;  // We force a logout only if the user has first added a POD for the very first time 
     var $zoneetree1 = $("#zonetree").clone().attr("id", "zonetree1");  
     $("#midmenu_container").append($zoneetree1.show());
@@ -27,6 +41,7 @@ function afterLoadResourceJSP() {
 
     function zoneJSONToTemplate(json, template) {
         var zoneid = json.id;
+        template.attr("id", "zone_" + zoneid);  
 	    template.data("id", zoneid).data("name", fromdb(json.name));
 	    template.find("#zone_name")
 		    .text(fromdb(json.name))
@@ -76,12 +91,15 @@ function afterLoadResourceJSP() {
 	    });
     }
     
-    function podJSONToTemplate(json, template) {		    
+    function podJSONToTemplate(json, template) {	
+        var podid = json.id;
+        template.attr("id", "pod_" + podid);  
+    	    
 		var ipRange = getIpRange(json.startip, json.endip);			
-		template.data("id", json.id).data("name", json.name);
+		template.data("id", podid).data("name", json.name);
 		
 		var podName = template.find("#pod_name").text(json.name);
-		podName.data("id", json.id);
+		podName.data("id", podid);
 		podName.data("zoneid", json.zoneid);
 		podName.data("name", json.name);
 		podName.data("cidr", json.cidr);
@@ -91,7 +109,7 @@ function afterLoadResourceJSP() {
 		podName.data("gateway", json.gateway);		
 		
 	    $.ajax({
-            data: createURL("command=listClusters&podid="+json.id+maxPageSize),
+            data: createURL("command=listClusters&podid="+podid+maxPageSize),
 	        dataType: "json",
 	        success: function(json) {
 		        var items = json.listclustersresponse.cluster;
@@ -108,8 +126,9 @@ function afterLoadResourceJSP() {
 	}
 		
 	function systemvmJSONToTemplate(json, template) {	
-	    template.data("id", json.id).data("name", json.name);
-	     
+	    var systemvmid = json.id;	
+	    template.attr("id", "systemvm_"+systemvmid);
+	    template.data("id", systemvmid).data("name", json.name);	     
 	    var systeymvmName = template.find("#systemvm_name").text(json.name);
 		systeymvmName.data("systemvmtype", json.systemvmtype);
 		systeymvmName.data("name", json.name);	
@@ -152,7 +171,7 @@ function afterLoadResourceJSP() {
 		        var container = template.find("#primarystorages_container").empty();
 		        if (items != null && items.length > 0) {					    
 			        for (var i = 0; i < items.length; i++) {
-				        var primaryStorageTemplate = $("#primary_storage_template").clone(true).attr("id", "primary_storage_"+items[i].id);
+				        var primaryStorageTemplate = $("#primarystorage_template").clone(true).attr("id", "primary_storage_"+items[i].id);
 				        primaryStorageJSONToTemplate(items[i], primaryStorageTemplate);
 				        container.append(primaryStorageTemplate.show());
 			        }
@@ -170,7 +189,7 @@ function afterLoadResourceJSP() {
 	function primaryStorageJSONToTemplate(json, template) {
 	    template.data("id", json.id).data("name", fromdb(json.name));
 	    
-	    var primaryStorageName = template.find("#primary_storage_name").text(fromdb(json.name));
+	    var primaryStorageName = template.find("#primarystorage_name").text(fromdb(json.name));
 	}
 	
 	$("#zone_template").bind("click", function(event) {
@@ -181,41 +200,113 @@ function afterLoadResourceJSP() {
 		var name = template.data("name");
 		
 		switch (action) {
-			case "zone_expand" :
-				if (target.hasClass("zonetree_closedarrows")) {
-					$("#zone_"+id).find("#zone_content").show();					
-					target.removeClass().addClass("zonetree_openarrows");
-				} else {
-					$("#zone_"+id).find("#zone_content").hide();
-					target.removeClass().addClass("zonetree_closedarrows");
+			case "zone_expand" :			   
+				if (target.hasClass("zonetree_closedarrows")) {						
+					target.removeClass().addClass("zonetree_openarrows");					
+					target.parent().parent().parent().find("#zone_content").show();	
+				} else {					
+					target.removeClass().addClass("zonetree_closedarrows");					
+					target.parent().parent().parent().find("#zone_content").hide();									
 				}
-				break;
-			case "zone_name" :
-				$(".zonetree_firstlevel_selected").removeClass().addClass("zonetree_firstlevel");
-				$(".zonetree_secondlevel_selected").removeClass().addClass("zonetree_secondlevel");
-				template.find(".zonetree_firstlevel").removeClass().addClass("zonetree_firstlevel_selected");
-									
-				var obj = {"id": target.data("id"), "name": target.data("name"), "dns1": target.data("dns1"), "dns2": target.data("dns2"), "internaldns1": target.data("internaldns1"), "internaldns2": target.data("internaldns2"), "vlan": target.data("vlan"), "guestcidraddress": target.data("guestcidraddress")};
-				//zoneObjectToRightPanel(obj);					
-				
+				break;	
+			case "zone_name":	
+			    $zoneetree1.find(".selected").removeClass("selected");
+			    target.parent().parent().parent().addClass("selected");				    
+			    showPage($zonePage);	    
+			    var obj = {"id": target.data("id"), "name": target.data("name"), "dns1": target.data("dns1"), "dns2": target.data("dns2"), "internaldns1": target.data("internaldns1"), "internaldns2": target.data("internaldns2"), "vlan": target.data("vlan"), "guestcidraddress": target.data("guestcidraddress")};
+				zoneJsonToDetailsTab(obj);							    		   			    
+			    break;
+			
+			
+			case "pod_expand" :				    	   
+				if (target.hasClass("zonetree_closedarrows")) {									
+					target.removeClass().addClass("zonetree_openarrows");
+					target.parent().parent().siblings("#pod_content").show();	
+				} else {					
+					target.removeClass().addClass("zonetree_closedarrows");
+					target.parent().parent().siblings("#pod_content").hide();
+				}
+				break;	
+			case "pod_name" :			   
+				$zoneetree1.find(".selected").removeClass("selected");
+				target.parent().parent().parent().addClass("selected");
+				showPage($podPage);
+			    var obj = {"id": target.data("id"), "zoneid": target.data("zoneid"), "name": target.data("name"), "cidr": target.data("cidr"), "startip": target.data("startip"), "endip": target.data("endip"), "ipRange": target.data("ipRange"), "gateway": target.data("gateway")};
+				podJsonToDetailsTab(obj);				
 				break;
 				
-			case "pod_name" :
-				$(".zonetree_firstlevel_selected").removeClass().addClass("zonetree_firstlevel");
-				$(".zonetree_secondlevel_selected").removeClass().addClass("zonetree_secondlevel");
-				target.parent(".zonetree_secondlevel").removeClass().addClass("zonetree_secondlevel_selected");
-									
-				var obj = {"id": target.data("id"), "zoneid": target.data("zoneid"), "name": target.data("name"), "cidr": target.data("cidr"), "startip": target.data("startip"), "endip": target.data("endip"), "ipRange": target.data("ipRange"), "gateway": target.data("gateway")};
-				//podObjectToRightPanel(obj);
+			
+			case "cluster_expand" :			   
+				if (target.hasClass("zonetree_closedarrows")) {
+				    target.removeClass().addClass("zonetree_openarrows");
+					target.parent().parent().siblings("#cluster_content").show();					
+					
+				} else {
+				    target.removeClass().addClass("zonetree_closedarrows");
+					target.parent().parent().siblings("#cluster_content").hide();					
+				}
+				break;		
+			case "cluster_name" :			   
+				$zoneetree1.find(".selected").removeClass("selected");
+			    target.parent().parent().parent().addClass("selected");
+			    showPage($clusterPage);
+			    //var obj = {"id": target.data("id"), "zoneid": target.data("zoneid"), "name": target.data("name"), "cidr": target.data("cidr"), "startip": target.data("startip"), "endip": target.data("endip"), "ipRange": target.data("ipRange"), "gateway": target.data("gateway")};
+				//clusterObjectToRightPanel(obj);				
+				break;	
 				
+				
+			case "host_expand" :			   
+				if (target.hasClass("zonetree_closedarrows")) {
+				    target.removeClass().addClass("zonetree_openarrows");
+					target.parent().parent().siblings("#host_content").show();					
+					
+				} else {
+				    target.removeClass().addClass("zonetree_closedarrows");
+					target.parent().parent().siblings("#host_content").hide();					
+				}
+				break;	
+			case "host_name" :			   
+				$zoneetree1.find(".selected").removeClass("selected");
+			    target.parent().parent().parent().addClass("selected");
+			    showPage($hostPage);
+				//var obj = {"id": target.data("id"), "zoneid": target.data("zoneid"), "name": target.data("name"), "cidr": target.data("cidr"), "startip": target.data("startip"), "endip": target.data("endip"), "ipRange": target.data("ipRange"), "gateway": target.data("gateway")};
+				//hostObjectToRightPanel(obj);				
+				break;	
+			
+			
+			case "primarystorage_expand" :			   
+				if (target.hasClass("zonetree_closedarrows")) {
+				    target.removeClass().addClass("zonetree_openarrows");
+					target.parent().parent().siblings("#primarystorage_content").show();					
+					
+				} else {
+				    target.removeClass().addClass("zonetree_closedarrows");
+					target.parent().parent().siblings("#primarystorage_content").hide();					
+				}
+				break;	
+			case "primarystorage_name" :			   
+				$zoneetree1.find(".selected").removeClass("selected");
+			    target.parent().parent().parent().addClass("selected");
+			    showPage($primarystoragePage);
+				//var obj = {"id": target.data("id"), "zoneid": target.data("zoneid"), "name": target.data("name"), "cidr": target.data("cidr"), "startip": target.data("startip"), "endip": target.data("endip"), "ipRange": target.data("ipRange"), "gateway": target.data("gateway")};
+				//primarystorageObjectToRightPanel(obj);				
 				break;
+						
+						
+			case "systemvm_name" :			   
+				$zoneetree1.find(".selected").removeClass("selected");			    		    
+			    target.parent().parent().parent().addClass("selected");		
+			    showPage($systemvmPage);
+				//var obj = {"id": target.data("id"), "zoneid": target.data("zoneid"), "name": target.data("name"), "cidr": target.data("cidr"), "startip": target.data("startip"), "endip": target.data("endip"), "ipRange": target.data("ipRange"), "gateway": target.data("gateway")};
+				//systemvmObjectToRightPanel(obj);				
+				break;
+			
 			
 			default:
 				break;
 		}
 		return false;
 	});
-
     
     function getIpRange(startip, endip) {
 	    var ipRange = "";
@@ -223,9 +314,45 @@ function afterLoadResourceJSP() {
 			ipRange = startip;
 		}
 		if (endip != null && endip.length > 0) {
-			ipRange = ipRange + "-" + endip;
+			ipRange = ipRange + " - " + endip;
 		}		
 		return ipRange;
+	}		
+	//***** build zone tree (end) *************************************************************************************************
+	
+	//***** zone page (begin) *****************************************************************************************************
+	//switch between different tabs in zone page 
+    var tabArray = [$zonePage.find("#tab_details"), $zonePage.find("#tab_network"), $zonePage.find("#tab_secondary_storage")];
+    var tabContentArray = [$zonePage.find("#tab_content_details"), $zonePage.find("#tab_content_network"), $zonePage.find("#tab_content_secondary_storage")];
+    switchBetweenDifferentTabs(tabArray, tabContentArray);       
+  
+    function zoneJsonToDetailsTab(jsonObj) {	    
+	    var $detailsTab = $zonePage.find("#tab_content_details");   
+        $detailsTab.data("jsonObj", jsonObj);           
+        $detailsTab.find("#id").text(fromdb(jsonObj.id));
+        $detailsTab.find("#name").text(fromdb(jsonObj.name));
+        $detailsTab.find("#dns1").text(fromdb(jsonObj.dns1));
+        $detailsTab.find("#dns2").text(fromdb(jsonObj.dns2));
+        $detailsTab.find("#internaldns1").text(fromdb(jsonObj.internaldns1));
+        $detailsTab.find("#internaldns2").text(fromdb(jsonObj.internaldns2));	
+        $detailsTab.find("#vlan").text(fromdb(jsonObj.vlan));
+        $detailsTab.find("#guestcidraddress").text(fromdb(jsonObj.guestcidraddress));     
+	}	  
+    //***** zone page (end) *******************************************************************************************************
+    
+    //***** pod page (begin) ******************************************************************************************************
+    	function podJsonToDetailsTab(jsonObj) {	    
+	    var $detailsTab = $podPage.find("#tab_content_details");   
+        $detailsTab.data("jsonObj", jsonObj);           
+        $detailsTab.find("#id").text(fromdb(jsonObj.id));
+        $detailsTab.find("#name").text(fromdb(jsonObj.name));
+        $detailsTab.find("#cidr").text(fromdb(jsonObj.cidr));        
+        $detailsTab.find("#ipRange").text(fromdb(jsonObj.ipRange));
+        $detailsTab.find("#gateway").text(fromdb(jsonObj.gateway));  
+        
+        //if (getDirectAttachUntaggedEnabled() == "true") 
+		//	$("#submenu_content_zones #action_add_directip_vlan").data("type", "pod").data("id", obj.id).data("name", obj.name).data("zoneid", obj.zoneid).show();		
 	}	
+	//***** pod page (end) ********************************************************************************************************
 }
 
diff --git a/ui/new/scripts/cloud.core2.volume.js b/ui/new/scripts/cloud.core2.volume.js
index 32126c3b237..141df633540 100644
--- a/ui/new/scripts/cloud.core2.volume.js
+++ b/ui/new/scripts/cloud.core2.volume.js
@@ -364,8 +364,8 @@ function afterLoadVolumeJSP() {
 	// *** recurring snapshot dialog - event binding (end) ******************************	    
          
     //***** switch between different tabs (begin) ********************************************************************
-    var tabArray = ["tab_details", "tab_snapshot"];
-    var tabContentArray = ["tab_content_details", "tab_content_snapshot"];
+    var tabArray = [$("#tab_details"), $("#tab_snapshot")];
+    var tabContentArray = [$("#tab_content_details"), $("#tab_content_snapshot")];
     switchBetweenDifferentTabs(tabArray, tabContentArray);       
     //***** switch between different tabs (end) **********************************************************************    
 }