From 5e8be4a43198eb6d8408dbec1631f0fa6610d4ef Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Sat, 18 Dec 2010 17:04:17 -0800
Subject: [PATCH] Place Add XXX buttons in each related page instead of
 index.jsp.

---
 ui/index.jsp                             | 168 +------------------
 ui/jsp/account.jsp                       |  23 +++
 ui/jsp/diskoffering.jsp                  |  14 ++
 ui/jsp/domain.jsp                        |  14 ++
 ui/jsp/host.jsp                          |  23 +++
 ui/jsp/instance.jsp                      | 197 ++++++++++++++---------
 ui/jsp/ipaddress.jsp                     |  17 +-
 ui/jsp/iso.jsp                           |  14 ++
 ui/jsp/network.jsp                       |  49 +++++-
 ui/jsp/pod.jsp                           |  31 ++++
 ui/jsp/resource.jsp                      |  27 +++-
 ui/jsp/securitygroup.jsp                 |  14 ++
 ui/jsp/serviceoffering.jsp               |  14 ++
 ui/jsp/template.jsp                      |  14 ++
 ui/jsp/volume.jsp                        |  16 +-
 ui/jsp/zone.jsp                          |  66 +++++++-
 ui/scripts/cloud.core.account.js         |  41 ++---
 ui/scripts/cloud.core.cluster.js         |  14 +-
 ui/scripts/cloud.core.diskoffering.js    |   7 +-
 ui/scripts/cloud.core.domain.js          |  14 +-
 ui/scripts/cloud.core.host.js            |   4 +-
 ui/scripts/cloud.core.init.js            |   8 +-
 ui/scripts/cloud.core.instance.js        |  42 ++---
 ui/scripts/cloud.core.ipaddress.js       |   6 +-
 ui/scripts/cloud.core.iso.js             |   6 +-
 ui/scripts/cloud.core.js                 |  40 ++---
 ui/scripts/cloud.core.network.js         |  27 ++--
 ui/scripts/cloud.core.pod.js             |  19 ++-
 ui/scripts/cloud.core.resource.js        |  21 ++-
 ui/scripts/cloud.core.securitygroup.js   |   6 +-
 ui/scripts/cloud.core.serviceoffering.js |   7 +-
 ui/scripts/cloud.core.template.js        |   6 +-
 ui/scripts/cloud.core.volume.js          |   6 +-
 ui/scripts/cloud.core.zone.js            |  34 ++--
 34 files changed, 582 insertions(+), 427 deletions(-)

diff --git a/ui/index.jsp b/ui/index.jsp
index da77f08dc56..042fc60e976 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -167,172 +167,10 @@
                             </div>
                         </div>
                                                 
-                        <div id="midmenu_add_links_container">
-							<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>
-									<div class="actionpanel_button_links" id="label">
-										<fmt:message key="label.add"/>
-									</div>
-								</div>
-							</div>
-							
-							<div class="actionpanel_button_wrapper" id="midmenu_add_zone_button" style="display: none;">
-								<div class="actionpanel_button">
-									<div class="actionpanel_button_icons">
-										<img src="images/addvm_actionicon.png" alt="Add Zone" /></div>
-									<div class="actionpanel_button_links" id="Div3">
-										<fmt:message key="label.add.zone"/>
-									</div>
-								</div>
-							</div>
-							<div class="actionpanel_button_wrapper" id="midmenu_add_cluster_button" style="display: none;">
-								<div class="actionpanel_button">
-									<div class="actionpanel_button_icons">
-										<img src="images/addvm_actionicon.png" alt="Add External Cluster" /></div>
-									<div class="actionpanel_button_links" id="label">
-										<fmt:message key="label.add.cluster"/>
-									</div>
-								</div>
-							</div>
-							<div class="actionpanel_button_wrapper" id="midmenu_add_host_button" style="display: none;">
-								<div class="actionpanel_button">
-									<div class="actionpanel_button_icons">
-										<img src="images/addvm_actionicon.png" alt="Add Host" /></div>
-									<div class="actionpanel_button_links" id="label">
-										<fmt:message key="label.add.host"/>
-									</div>
-								</div>
-							</div>
-							
-							<div class="actionpanel_button_wrapper" id="midmenu_add_primarystorage_button" style="display: none;">
-								<div class="actionpanel_button">
-									<div class="actionpanel_button_icons">
-										<img src="images/addvm_actionicon.png" alt="Add Primary Storage" /></div>
-									<div class="actionpanel_button_links" id="Div2">
-										<fmt:message key="label.add.primarystorage"/>
-									</div>
-								</div>
-							</div>
-							
-							<div class="actionpanel_button_wrapper" id="midmenu_add_secondarystorage_button" style="display: none;">
-								<div class="actionpanel_button">
-									<div class="actionpanel_button_icons">
-										<img src="images/addvm_actionicon.png" alt="Add Secondary Storage" /></div>
-									<div class="actionpanel_button_links" id="Div4">
-										<fmt:message key="label.add.secondarystorage"/>
-									</div>
-								</div>
-							</div>
-							
-							<div class="actionpanel_button_wrapper" id="midmenu_add_pod_button" style="display: none;">
-								<div class="actionpanel_button">
-									<div class="actionpanel_button_icons">
-										<img src="images/addvm_actionicon.png" alt="Add pod" /></div>
-									<div class="actionpanel_button_links" id="Div6">
-										<fmt:message key="label.add.pod"/>
-									</div>
-								</div>
-							</div>
-							<!--  
-							<div class="actionpanel_button_wrapper" id="midmenu_add_vlan_button" style="display: none;">
-								<div class="actionpanel_button">
-									<div class="actionpanel_button_icons">
-										<img src="images/addvm_actionicon.png" alt="Add VLAN" /></div>
-									<div class="actionpanel_button_links" id="Div8">
-										<fmt:message key="label.add.vlan"/>
-									</div>
-								</div>
-							</div>
-							-->
-							<div class="actionpanel_button_wrapper" id="midmenu_add_network_button" style="display: none;">
-								<div class="actionpanel_button">
-									<div class="actionpanel_button_icons">
-										<img src="images/addvm_actionicon.png" alt="Add Network" /></div>
-									<div class="actionpanel_button_links" id="Div8">
-										Add Network
-									</div>
-								</div>
-							</div>
-							
-							<div class="actionpanel_button_wrapper" id="midmenu_add_iprange_button" style="display: none;">
-								<div class="actionpanel_button">
-									<div class="actionpanel_button_icons">
-										<img src="images/addvm_actionicon.png" alt="Add IP Range" /></div>
-									<div class="actionpanel_button_links" id="Div8">
-										Add IP Range
-									</div>
-								</div>
-							</div>
-							
-							<div class="actionpanel_button_wrapper" id="midmenu_add_external_firewall_button" style="display: none;">
-								<div class="actionpanel_button">
-									<div class="actionpanel_button_icons">
-										<img src="images/addvm_actionicon.png" alt="Add Firewall" /></div>
-									<div class="actionpanel_button_links" id="Div10">
-										Add Firewall
-									</div>
-								</div>
-							</div>
-							
-							<div class="actionpanel_button_wrapper" id="midmenu_add_load_balancer_button" style="display: none;">
-								<div class="actionpanel_button">
-									<div class="actionpanel_button_icons">
-										<img src="images/addvm_actionicon.png" alt="Add Load Balancer" /></div>
-									<div class="actionpanel_button_links" id="Div10">
-										Add Load Balancer
-									</div>
-								</div>
-							</div>
-							
-							<div class="actionpanel_button_wrapper" id="midmenu_Update_SSL_Certificate_button" style="display: none;">
-								<div class="actionpanel_button">
-									<div class="actionpanel_button_icons">
-										<img src="images/addvm_actionicon.png" alt="Update SSL Certificate" /></div>
-									<div class="actionpanel_button_links" id="Div12">
-										<fmt:message key="label.update.ssl.cert"/>
-									</div>
-								</div>
-							</div>
-						   
-							<div class="actionpanel_button_wrapper" id="midmenu_startvm_link" style="display: none;">
-								<div class="actionpanel_button">
-									<div class="actionpanel_button_icons">
-										<img src="images/startvm_actionicon.png" alt="Start VM" /></div>
-									<div class="actionpanel_button_links">
-										<fmt:message key="label.vm.start"/>
-									</div>
-								</div>
-							</div>
-							<div class="actionpanel_button_wrapper" id="midmenu_stopvm_link" style="display: none;">
-								<div class="actionpanel_button">
-									<div class="actionpanel_button_icons">
-										<img src="images/stopvm_actionicon.png" alt="Stop VM" /></div>
-									<div class="actionpanel_button_links">
-										<fmt:message key="label.vm.stop"/>
-									</div>
-								</div>
-							</div>
-							<div class="actionpanel_button_wrapper" id="midmenu_rebootvm_link" style="display: none;">
-								<div class="actionpanel_button">
-									<div class="actionpanel_button_icons">
-										<img src="images/rebootvm_actionicon.png" alt="Reboot VM" /></div>
-									<div class="actionpanel_button_links">
-										<fmt:message key="label.vm.reboot"/>
-									</div>
-								</div>
-							</div>
-							<div class="actionpanel_button_wrapper" id="midmenu_destroyvm_link" style="display: none;">
-								<div class="actionpanel_button">
-									<div class="actionpanel_button_icons">
-										<img src="images/destroyvm_actionicon.png" alt="Destroy VM" /></div>
-									<div class="actionpanel_button_links">
-										<fmt:message key="label.vm.destroy"/>
-									</div>
-								</div>
-							</div>
+                        <div id="top_button_container">		
+                            			
 						</div>
+						
 						<div class="actionpanel_button_wrapper" id="help_link" style="display: block; border:none; float: right; position: relative;">
 							<div class="actionpanel_button" id="help_button">
 								<div class="actionpanel_button_icons">
diff --git a/ui/jsp/account.jsp b/ui/jsp/account.jsp
index 95978821355..7e075999c7f 100644
--- a/ui/jsp/account.jsp
+++ b/ui/jsp/account.jsp
@@ -167,6 +167,29 @@
 </div>
 <!-- account detail panel (end) -->
 
+<!--  top buttons (begin) -->
+<div id="top_buttons">
+    <div class="actionpanel_button_wrapper" id="add_account_button">
+        <div class="actionpanel_button">
+            <div class="actionpanel_button_icons">
+                <img src="images/addvm_actionicon.png" alt="Add Account" /></div>
+            <div class="actionpanel_button_links">
+                Add Account
+            </div>
+        </div>
+    </div>
+    <div class="actionpanel_button_wrapper" id="add_user_button" style="display: none">
+        <div class="actionpanel_button">
+            <div class="actionpanel_button_icons">
+                <img src="images/addvm_actionicon.png" alt="Add User" /></div>
+            <div class="actionpanel_button_links">
+                Add User
+            </div>
+        </div>
+    </div>
+</div>
+<!--  top buttons (end) -->
+
 <!-- user tab template (begin) -->
 <div class="grid_container" id="user_tab_template" style="display: none">
     <div class="grid_header">
diff --git a/ui/jsp/diskoffering.jsp b/ui/jsp/diskoffering.jsp
index 1c3fd73d014..c86c0971772 100644
--- a/ui/jsp/diskoffering.jsp
+++ b/ui/jsp/diskoffering.jsp
@@ -144,6 +144,20 @@
     </div>
 </div>
 
+<!--  top buttons (begin) -->
+<div id="top_buttons">
+    <div class="actionpanel_button_wrapper" id="add_diskoffering_button">
+        <div class="actionpanel_button">
+            <div class="actionpanel_button_icons">
+                <img src="images/addvm_actionicon.png" alt="Add Disk Offering" /></div>
+            <div class="actionpanel_button_links">
+                Add Disk Offering
+            </div>
+        </div>
+    </div>
+</div>
+<!--  top buttons (end) -->
+
 <!-- Add Disk Offering Dialog -->
 <div id="dialog_add_disk" title="Add Disk Offering" style="display:none">
 	<p>Please fill in the following data to add a new disk Offering.</p>
diff --git a/ui/jsp/domain.jsp b/ui/jsp/domain.jsp
index 859a034d8bf..3281f612e7f 100644
--- a/ui/jsp/domain.jsp
+++ b/ui/jsp/domain.jsp
@@ -221,6 +221,20 @@
 
 <!-- domain detail panel (end) -->
 
+<!--  top buttons (begin) -->
+<div id="top_buttons">
+    <div class="actionpanel_button_wrapper" id="add_domain_button">
+        <div class="actionpanel_button">
+            <div class="actionpanel_button_icons">
+                <img src="images/addvm_actionicon.png" alt="Add Domain" /></div>
+            <div class="actionpanel_button_links">
+                Add Domain
+            </div>
+        </div>
+    </div>
+</div>
+<!--  top buttons (end) -->
+
 <!-- admin account tab template (begin) -->
 <div class="grid_container" id="admin_account_tab_template" style="display: none">
     <div class="grid_header">
diff --git a/ui/jsp/host.jsp b/ui/jsp/host.jsp
index 8796d9f0523..d4dd8cd7d10 100644
--- a/ui/jsp/host.jsp
+++ b/ui/jsp/host.jsp
@@ -344,6 +344,29 @@
     <!--Statistics tab (end)--> 
 </div>
 
+<!--  top buttons (begin) -->
+<div id="top_buttons"> 
+    <div class="actionpanel_button_wrapper" id="add_host_button">
+        <div class="actionpanel_button">
+            <div class="actionpanel_button_icons">
+                <img src="images/addvm_actionicon.png" alt="Add Host" /></div>
+            <div class="actionpanel_button_links">
+                Add Host
+            </div>
+        </div>
+    </div>
+    <div class="actionpanel_button_wrapper" id="add_primarystorage_button">
+        <div class="actionpanel_button">
+            <div class="actionpanel_button_icons">
+                <img src="images/addvm_actionicon.png" alt="Add Primary Storage" /></div>
+            <div class="actionpanel_button_links">
+                Add Primary Storage
+            </div>
+        </div>
+    </div>
+</div>
+<!--  top buttons (end) -->
+
 <!--  Primary Storage tab template (begin) -->
 <div class="grid_container" id="primarystorage_tab_template" style="display: none">
     <div class="grid_header">
diff --git a/ui/jsp/instance.jsp b/ui/jsp/instance.jsp
index 5e10e54f348..fec678812cc 100644
--- a/ui/jsp/instance.jsp
+++ b/ui/jsp/instance.jsp
@@ -10,80 +10,6 @@
     CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale);
 %>
 
-<!--  nic tab template (begin) -->
-<div class="grid_container" id="nic_tab_template" style="display: none">	
-    <div class="grid_header">
-        <div class="grid_header_title" id="title">
-        </div>
-		<!--
-        <div class="grid_actionbox" id="volume_action_link">
-            <div class="grid_actionsdropdown_box" id="nic_action_menu" style="display: none;">
-                <ul class="actionsdropdown_boxlist" id="action_list">
-                </ul>
-            </div>
-        </div>
-        <div class="gridheader_loaderbox" id="spinning_wheel" style="display: none; border: 1px solid #999; ">
-            <div class="gridheader_loader" id="icon">
-            </div>
-            <p id="description">
-                Waiting &hellip;
-            </p>
-        </div>    
-		-->
-    </div>
-    
-    <div class="grid_rows" id="after_action_info_container" style="display:none">
-        <div class="grid_row_cell" style="width: 90%; border: none;">
-            <div class="row_celltitles">
-                <strong id="after_action_info">Message will appear here</strong></div>
-        </div>
-    </div>
-        
-    <div class="grid_rows even">
-        <div class="grid_row_cell" style="width: 20%;">
-            <div class="row_celltitles">
-                IP:</div>
-        </div>
-        <div class="grid_row_cell" style="width: 79%;">
-            <div class="row_celltitles" id="ip">
-            </div>
-        </div>
-    </div>
-    <div class="grid_rows odd">
-        <div class="grid_row_cell" style="width: 20%;">
-            <div class="row_celltitles">
-                Gateway:</div>
-        </div>
-        <div class="grid_row_cell" style="width: 79%;">
-            <div class="row_celltitles" id="gateway">
-            </div>
-        </div>
-    </div>
-    <div class="grid_rows even">
-        <div class="grid_row_cell" style="width: 20%;">
-            <div class="row_celltitles">
-                Netmask:</div>
-        </div>
-        <div class="grid_row_cell" style="width: 79%;">
-            <div class="row_celltitles" id="netmask">
-            </div>
-        </div>
-    </div>
-	<div class="grid_rows even">
-        <div class="grid_row_cell" style="width: 20%;">
-            <div class="row_celltitles">
-                Type:</div>
-        </div>
-        <div class="grid_row_cell" style="width: 79%;">
-            <div class="row_celltitles" id="type">
-            </div>
-        </div>
-    </div>
-</div>
-<!--  nic tab template (end) -->
-
-
-
 <!-- VM detail panel (begin) -->
 <div class="main_title" id="right_panel_header">
     <div class="main_titleicon">
@@ -1038,6 +964,78 @@
 </div>
 <!-- VM Wizard - disk Offering template (end)-->
 
+<!--  nic tab template (begin) -->
+<div class="grid_container" id="nic_tab_template" style="display: none">	
+    <div class="grid_header">
+        <div class="grid_header_title" id="title">
+        </div>
+		<!--
+        <div class="grid_actionbox" id="volume_action_link">
+            <div class="grid_actionsdropdown_box" id="nic_action_menu" style="display: none;">
+                <ul class="actionsdropdown_boxlist" id="action_list">
+                </ul>
+            </div>
+        </div>
+        <div class="gridheader_loaderbox" id="spinning_wheel" style="display: none; border: 1px solid #999; ">
+            <div class="gridheader_loader" id="icon">
+            </div>
+            <p id="description">
+                Waiting &hellip;
+            </p>
+        </div>    
+		-->
+    </div>
+    
+    <div class="grid_rows" id="after_action_info_container" style="display:none">
+        <div class="grid_row_cell" style="width: 90%; border: none;">
+            <div class="row_celltitles">
+                <strong id="after_action_info">Message will appear here</strong></div>
+        </div>
+    </div>
+        
+    <div class="grid_rows even">
+        <div class="grid_row_cell" style="width: 20%;">
+            <div class="row_celltitles">
+                IP:</div>
+        </div>
+        <div class="grid_row_cell" style="width: 79%;">
+            <div class="row_celltitles" id="ip">
+            </div>
+        </div>
+    </div>
+    <div class="grid_rows odd">
+        <div class="grid_row_cell" style="width: 20%;">
+            <div class="row_celltitles">
+                Gateway:</div>
+        </div>
+        <div class="grid_row_cell" style="width: 79%;">
+            <div class="row_celltitles" id="gateway">
+            </div>
+        </div>
+    </div>
+    <div class="grid_rows even">
+        <div class="grid_row_cell" style="width: 20%;">
+            <div class="row_celltitles">
+                Netmask:</div>
+        </div>
+        <div class="grid_row_cell" style="width: 79%;">
+            <div class="row_celltitles" id="netmask">
+            </div>
+        </div>
+    </div>
+	<div class="grid_rows even">
+        <div class="grid_row_cell" style="width: 20%;">
+            <div class="row_celltitles">
+                Type:</div>
+        </div>
+        <div class="grid_row_cell" style="width: 79%;">
+            <div class="row_celltitles" id="type">
+            </div>
+        </div>
+    </div>
+</div>
+<!--  nic tab template (end) -->
+
 <!--  volume tab template (begin) -->
 <div class="grid_container" id="volume_tab_template" style="display: none">	
     <div class="grid_header">
@@ -1274,6 +1272,57 @@
 </div>
 <!--  router tab template (end) -->
 
+<!--  top buttons (begin) -->
+<div id="top_buttons">
+    <div class="actionpanel_button_wrapper" id="add_vm_button">
+        <div class="actionpanel_button">
+            <div class="actionpanel_button_icons">
+                <img src="images/addvm_actionicon.png" alt="Add VM" /></div>
+            <div class="actionpanel_button_links">
+                Add VM
+            </div>
+        </div>
+    </div>
+
+    <div class="actionpanel_button_wrapper" id="start_vm_button">
+        <div class="actionpanel_button">
+            <div class="actionpanel_button_icons">
+                <img src="images/startvm_actionicon.png" alt="Start VM" /></div>
+            <div class="actionpanel_button_links">
+                <fmt:message key="label.vm.start" />
+            </div>
+        </div>
+    </div>
+    <div class="actionpanel_button_wrapper" id="stop_vm_button">
+        <div class="actionpanel_button">
+            <div class="actionpanel_button_icons">
+                <img src="images/stopvm_actionicon.png" alt="Stop VM" /></div>
+            <div class="actionpanel_button_links">
+                <fmt:message key="label.vm.stop" />
+            </div>
+        </div>
+    </div>
+    <div class="actionpanel_button_wrapper" id="reboot_vm_button">
+        <div class="actionpanel_button">
+            <div class="actionpanel_button_icons">
+                <img src="images/rebootvm_actionicon.png" alt="Reboot VM" /></div>
+            <div class="actionpanel_button_links">
+                <fmt:message key="label.vm.reboot" />
+            </div>
+        </div>
+    </div>
+    <div class="actionpanel_button_wrapper" id="destroy_vm_button">
+        <div class="actionpanel_button">
+            <div class="actionpanel_button_icons">
+                <img src="images/destroyvm_actionicon.png" alt="Destroy VM" /></div>
+            <div class="actionpanel_button_links">
+                <fmt:message key="label.vm.destroy" />
+            </div>
+        </div>
+    </div>
+</div>
+<!--  top buttons (end) -->
+
 <!--  ***** Dialogs (begin) ***** -->
 <!-- Detach ISO Dialog -->
 <div id="dialog_detach_iso_from_vm" title="Confirmation" style="display:none">
diff --git a/ui/jsp/ipaddress.jsp b/ui/jsp/ipaddress.jsp
index db09b330782..697a5bfde33 100644
--- a/ui/jsp/ipaddress.jsp
+++ b/ui/jsp/ipaddress.jsp
@@ -23,8 +23,7 @@
     </div>
     <div class="tabbox" style="margin-top: 15px;">
         <div class="content_tabs on" id="tab_details">
-            <%=t.t("Details")%></div>
-		<!-- NOTE: Reenable this tab after 2.2 Beta 2 -->
+            <%=t.t("Details")%></div>		
 		<div class="content_tabs off" id="tab_port_forwarding">
             <%=t.t("Port Forwarding")%></div>
         <div class="content_tabs off" id="tab_load_balancer">
@@ -344,7 +343,19 @@
 </div>
 <!-- IP Address detail panel (end) -->
 
-
+<!--  top buttons (begin) -->
+<div id="top_buttons">
+    <div class="actionpanel_button_wrapper" id="acquire_new_ip_button">
+        <div class="actionpanel_button">
+            <div class="actionpanel_button_icons">
+                <img src="images/addvm_actionicon.png" alt="Acquire New IP" /></div>
+            <div class="actionpanel_button_links">
+                Acquire New IP
+            </div>
+        </div>
+    </div>
+</div>
+<!--  top buttons (end) -->
 
 <!-- Load Balancer Template (begin) -->
 <div class="grid_rows odd" id="load_balancer_template" style="display:none">
diff --git a/ui/jsp/iso.jsp b/ui/jsp/iso.jsp
index e07bca0177a..59933c5738f 100644
--- a/ui/jsp/iso.jsp
+++ b/ui/jsp/iso.jsp
@@ -220,6 +220,20 @@
 </div>
 <!-- ISO detail panel (end) -->
 
+<!--  top buttons (begin) -->
+<div id="top_buttons">
+    <div class="actionpanel_button_wrapper" id="add_iso_button">
+        <div class="actionpanel_button">
+            <div class="actionpanel_button_icons">
+                <img src="images/addvm_actionicon.png" alt="Add ISO" /></div>
+            <div class="actionpanel_button_links">
+                Add ISO
+            </div>
+        </div>
+    </div>
+</div>
+<!--  top buttons (end) -->
+
 <!-- Add ISO Dialog (begin) -->
 <div id="dialog_add_iso" title="Add ISO" style="display:none">		
 	<div class="dialog_formcontent">
diff --git a/ui/jsp/network.jsp b/ui/jsp/network.jsp
index db0a64e8ff0..6936009e11e 100644
--- a/ui/jsp/network.jsp
+++ b/ui/jsp/network.jsp
@@ -392,13 +392,52 @@
             <div id="tab_container">
             </div>
         </div> 
-        <!-- IP Allocation tab (end)-->        
-             
-    </div>
-    <!-- ***** Direct Network Page (end) ***** -->
-        
+        <!-- IP Allocation tab (end)-->   
+    </div>          
 </div>
 
+<!--  top buttons (begin) -->
+<div id="top_buttons"> 
+    <div class="actionpanel_button_wrapper" id="add_network_button">
+        <div class="actionpanel_button">
+            <div class="actionpanel_button_icons">
+                <img src="images/addvm_actionicon.png" alt="Add Network" /></div>
+            <div class="actionpanel_button_links">
+                Add Network
+            </div>
+        </div>
+    </div>
+    <div class="actionpanel_button_wrapper" id="add_iprange_button">
+        <div class="actionpanel_button">
+            <div class="actionpanel_button_icons">
+                <img src="images/addvm_actionicon.png" alt="Add IP Range" /></div>
+            <div class="actionpanel_button_links">
+                Add IP Range
+            </div>
+        </div>
+    </div>
+    <div class="actionpanel_button_wrapper" id="add_external_firewall_button"
+       >
+        <div class="actionpanel_button">
+            <div class="actionpanel_button_icons">
+                <img src="images/addvm_actionicon.png" alt="Add Firewall" /></div>
+            <div class="actionpanel_button_links">
+                Add Firewall
+            </div>
+        </div>
+    </div>
+    <div class="actionpanel_button_wrapper" id="add_load_balancer_button">
+        <div class="actionpanel_button">
+            <div class="actionpanel_button_icons">
+                <img src="images/addvm_actionicon.png" alt="Add Load Balancer" /></div>
+            <div class="actionpanel_button_links">
+                Add Load Balancer
+            </div>
+        </div>
+    </div>
+</div>
+<!--  top buttons (end) -->
+
 <!--  External Firewall template (begin) -->
 <div class="grid_container" id="externalfirewall_template" style="display: none">    
 	<div class="grid_header">
diff --git a/ui/jsp/pod.jsp b/ui/jsp/pod.jsp
index e8042f4c626..c52be574c94 100644
--- a/ui/jsp/pod.jsp
+++ b/ui/jsp/pod.jsp
@@ -141,6 +141,37 @@
 
 </div>
 
+<!--  top buttons (begin) -->
+<div id="top_buttons">
+    <div class="actionpanel_button_wrapper" id="add_cluster_button">
+        <div class="actionpanel_button">
+            <div class="actionpanel_button_icons">
+                <img src="images/addvm_actionicon.png" alt="Add Cluster" /></div>
+            <div class="actionpanel_button_links">
+                Add Cluster
+            </div>
+        </div>
+    </div>
+    <div class="actionpanel_button_wrapper" id="add_host_button">
+        <div class="actionpanel_button">
+            <div class="actionpanel_button_icons">
+                <img src="images/addvm_actionicon.png" alt="Add Host" /></div>
+            <div class="actionpanel_button_links">
+                Add Host
+            </div>
+        </div>
+    </div>
+    <div class="actionpanel_button_wrapper" id="add_primarystorage_button">
+        <div class="actionpanel_button">
+            <div class="actionpanel_button_icons">
+                <img src="images/addvm_actionicon.png" alt="Add Primary Storage" /></div>
+            <div class="actionpanel_button_links">
+                Add Primary Storage
+            </div>
+        </div>
+    </div>
+</div>
+<!--  top buttons (end) -->
 
 <!--  Network tab template (begin) -->
 <div class="grid_container" id="network_tab_template" style="display: none">
diff --git a/ui/jsp/resource.jsp b/ui/jsp/resource.jsp
index 68ef3d7e363..ed7a368b59f 100644
--- a/ui/jsp/resource.jsp
+++ b/ui/jsp/resource.jsp
@@ -85,12 +85,33 @@
                 <div class="dbrow_cell" style="width: 10%; border: none;">
                 	<div id="add_primarystorage_shortcut" class="resadd_button" title="Add Primary Storage"></div>
                 </div>
-            </div>
-       
-
+            </div>       
+        </div>
     </div>
 </div>
 
+<!--  top buttons (begin) -->
+<div id="top_buttons">
+    <div class="actionpanel_button_wrapper" id="add_zone_button">
+        <div class="actionpanel_button">
+            <div class="actionpanel_button_icons">
+                <img src="images/addvm_actionicon.png" alt="Add Zone" /></div>
+            <div class="actionpanel_button_links">
+                Add Zone
+            </div>
+        </div>
+    </div>    
+    <div class="actionpanel_button_wrapper" id="Update_SSL_Certificate_button">
+        <div class="actionpanel_button">
+            <div class="actionpanel_button_icons">
+                <img src="images/addvm_actionicon.png" alt="Update SSL Certificate" /></div>
+            <div class="actionpanel_button_links">
+                Update SSL Certificate
+            </div>
+        </div>
+    </div>    
+</div>
+<!--  top buttons (end) -->
 
 <!-- Zone wizard (begin)-->
 <div id="wizard_overlay" class="ui-widget-overlay" style="display:none;"></div>
diff --git a/ui/jsp/securitygroup.jsp b/ui/jsp/securitygroup.jsp
index 2cb7efe25da..945b906fa3e 100644
--- a/ui/jsp/securitygroup.jsp
+++ b/ui/jsp/securitygroup.jsp
@@ -131,6 +131,20 @@
     <!--Ingress Rule tab (end)-->    
 </div>
 
+<!--  top buttons (begin) -->
+<div id="top_buttons">
+    <div class="actionpanel_button_wrapper" id="add_securitygroup_button">
+        <div class="actionpanel_button">
+            <div class="actionpanel_button_icons">
+                <img src="images/addvm_actionicon.png" alt="Add Security Group" /></div>
+            <div class="actionpanel_button_links">
+                Add Security Group
+            </div>
+        </div>
+    </div>
+</div>
+<!--  top buttons (end) -->
+
 <!--  Ingress Rule tab template (begin) -->
 <div class="grid_container" id="ingressrule_tab_template" style="display: none">
     <div class="grid_header">
diff --git a/ui/jsp/serviceoffering.jsp b/ui/jsp/serviceoffering.jsp
index a6d10599b34..5516179afb4 100644
--- a/ui/jsp/serviceoffering.jsp
+++ b/ui/jsp/serviceoffering.jsp
@@ -177,6 +177,20 @@
     </div>
 </div>
 
+<!--  top buttons (begin) -->
+<div id="top_buttons">
+    <div class="actionpanel_button_wrapper" id="add_serviceoffering_button">
+        <div class="actionpanel_button">
+            <div class="actionpanel_button_icons">
+                <img src="images/addvm_actionicon.png" alt="Add Service Offering" /></div>
+            <div class="actionpanel_button_links">
+                Add Service Offering
+            </div>
+        </div>
+    </div>
+</div>
+<!--  top buttons (end) -->
+
 <!-- Add Service Offering Dialog -->
 <div id="dialog_add_service" title="Add Service Offering" style="display:none">
 	<p>Please fill in the following data to add a new Service Offering.</p>
diff --git a/ui/jsp/template.jsp b/ui/jsp/template.jsp
index fb24e727bbc..fb90235c978 100644
--- a/ui/jsp/template.jsp
+++ b/ui/jsp/template.jsp
@@ -233,6 +233,20 @@
 </div>
 <!-- template detail panel (end) -->
 
+<!--  top buttons (begin) -->
+<div id="top_buttons">
+    <div class="actionpanel_button_wrapper" id="add_template_button">
+        <div class="actionpanel_button">
+            <div class="actionpanel_button_icons">
+                <img src="images/addvm_actionicon.png" alt="Add Template" /></div>
+            <div class="actionpanel_button_links">
+                Add Template
+            </div>
+        </div>
+    </div>
+</div>
+<!--  top buttons (end) -->
+
 <!-- Copy Template Dialog (begin) -->
 <div id="dialog_copy_template" title="Copy Template" style="display:none">
 	<p>Copy template <b id="copy_template_name_text">XXX</b> from zone <b id="copy_template_source_zone_text">XXX</b> to</p>
diff --git a/ui/jsp/volume.jsp b/ui/jsp/volume.jsp
index ce0995b3461..c04faa8910a 100644
--- a/ui/jsp/volume.jsp
+++ b/ui/jsp/volume.jsp
@@ -195,7 +195,21 @@
     </div> 
     <!--Snapshot tab (end)-->
 </div>
-<!-- volume detail panel (end) -->
+
+<!--  top buttons (begin) -->
+<div id="top_buttons">
+    <div class="actionpanel_button_wrapper" id="add_volume_button">
+        <div class="actionpanel_button">
+            <div class="actionpanel_button_icons">
+                <img src="images/addvm_actionicon.png" alt="Add Volume" /></div>
+            <div class="actionpanel_button_links">
+                Add Volume
+            </div>
+        </div>
+    </div>
+</div>
+<!--  top buttons (end) -->
+
 <!-- Create Template Dialog -->
 <div id="dialog_create_template" title="Create Template" style="display: none">
     <p>
diff --git a/ui/jsp/zone.jsp b/ui/jsp/zone.jsp
index d9b86d508c8..c46d2f588c1 100644
--- a/ui/jsp/zone.jsp
+++ b/ui/jsp/zone.jsp
@@ -245,10 +245,72 @@
 	        </div>
 	    </div>   
     </div>
-    <!-- Network tab (end)-->   
-    
+    <!-- Network tab (end)-->       
 </div>
 
+<!--  top buttons (begin) -->
+<div id="top_buttons">  
+    <div class="actionpanel_button_wrapper" id="add_cluster_button">
+        <div class="actionpanel_button">
+            <div class="actionpanel_button_icons">
+                <img src="images/addvm_actionicon.png" alt="Add Cluster" /></div>
+            <div class="actionpanel_button_links">
+                Add Cluster
+            </div>
+        </div>
+    </div>
+    <div class="actionpanel_button_wrapper" id="add_host_button">
+        <div class="actionpanel_button">
+            <div class="actionpanel_button_icons">
+                <img src="images/addvm_actionicon.png" alt="Add Host" /></div>
+            <div class="actionpanel_button_links">
+                Add Host
+            </div>
+        </div>
+    </div>
+    <div class="actionpanel_button_wrapper" id="add_primarystorage_button">
+        <div class="actionpanel_button">
+            <div class="actionpanel_button_icons">
+                <img src="images/addvm_actionicon.png" alt="Add Primary Storage" /></div>
+            <div class="actionpanel_button_links">
+                Add Primary Storage
+            </div>
+        </div>
+    </div>
+    <div class="actionpanel_button_wrapper" id="add_secondarystorage_button"
+       >
+        <div class="actionpanel_button">
+            <div class="actionpanel_button_icons">
+                <img src="images/addvm_actionicon.png" alt="Add Secondary Storage" /></div>
+            <div class="actionpanel_button_links">
+                Add Secondary Storage
+            </div>
+        </div>
+    </div>
+    <div class="actionpanel_button_wrapper" id="add_pod_button">
+        <div class="actionpanel_button">
+            <div class="actionpanel_button_icons">
+                <img src="images/addvm_actionicon.png" alt="Add pod" /></div>
+            <div class="actionpanel_button_links">
+                Add pod
+            </div>
+        </div>
+    </div>     
+    <!--
+    <div class="actionpanel_button_wrapper" id="add_vlan_button" style="display: none;">
+        <div class="actionpanel_button">
+            <div class="actionpanel_button_icons">
+                <img src="images/addvm_actionicon.png" alt="Add VLAN" /></div>
+            <div class="actionpanel_button_links">
+                Add VLAN
+            </div>
+        </div>
+    </div>
+    -->
+</div>
+<!--  top buttons (end) -->
+
+
 <!-- ***** dialogs ***** (begin)-->
 <!-- Add Pod Dialog (begin) -->
 <div id="dialog_add_pod" title="Add Pod" style="display: none">
diff --git a/ui/scripts/cloud.core.account.js b/ui/scripts/cloud.core.account.js
index 9a500397fba..75eeb15d0de 100644
--- a/ui/scripts/cloud.core.account.js
+++ b/ui/scripts/cloud.core.account.js
@@ -55,6 +55,10 @@ function afterLoadAccountJSP() {
         initDialog("dialog_enable_account");  
         initDialog("dialog_edit_user", 450);    
         initDialog("dialog_change_password", 450);    
+        initDialog("dialog_add_user", 450);
+        
+        bindAddAccountButton();
+        bindAddUserButton();   
     }
     
     // switch between different tabs 
@@ -129,7 +133,7 @@ function initTimezonesObj() {
     timezones['Pacific/Auckland']='[UTC+12:00] New Zealand Standard Time';
 }
 
-function initAddAccountDialog() {     
+function bindAddAccountButton() {     
     initDialog("dialog_add_account", 450);
                    
     var $dialogAddAccount = $("#dialog_add_account");
@@ -146,11 +150,8 @@ function initAddAccountDialog() {
 			}					    	
 		}
 	});		    
-       
-    //add button ***
-    $("#midmenu_add_link").find("#label").text("Add Account"); 
-    $("#midmenu_add_link").show();     
-    $("#midmenu_add_link").unbind("click").bind("click", function(event) {    		
+             
+    $("#add_account_button").unbind("click").bind("click", function(event) {    		
 		$dialogAddAccount
 		.dialog('option', 'buttons', { 					
 			"Create": function() { 	
@@ -239,23 +240,21 @@ function initAddAccountDialog() {
 	});
 }
 
-function initAddUserDialog() {     
-    initDialog("dialog_add_user", 450);
-                   
+function bindAddUserButton() {                 
     var $dialogAddUser = $("#dialog_add_user");
-           
-    //add button ***
-    $("#midmenu_add_link").find("#label").text("Add User"); 
-    $("#midmenu_add_link").show();     
-    $("#midmenu_add_link").unbind("click").bind("click", function(event) {    
+         
+    $("#add_user_button").show().unbind("click").bind("click", function(event) {   
         var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
         if($midmenuItem1 == null)
             return;
         
         var accountObj = $midmenuItem1.data("jsonObj");
         if(accountObj == null)
-            return;
-  
+            return;    
+         
+        if($("#tab_user").hasClass("off"))
+            $("#tab_user").click();     
+             
         $dialogAddUser.find("#account_name").text(accountObj.name);
             	
 		$dialogAddUser
@@ -372,10 +371,7 @@ function accountJsonToDetailsTab() {
     var jsonObj = $midmenuItem1.data("jsonObj");
     if(jsonObj == null)
         return;
-          
-    if(isAdmin()) 
-        initAddAccountDialog();         
-  
+   
     var $detailsTab = $("#right_panel_content").find("#tab_content_details");           
     $detailsTab.find("#grid_header_title").text(fromdb(jsonObj.name));
     $detailsTab.find("#id").text(fromdb(jsonObj.id));
@@ -447,10 +443,7 @@ function accountJsonToUserTab() {
 	
 	var jsonObj = $midmenuItem1.data("jsonObj");	
 	if(jsonObj == null)
-	    return;
-		    
-    if(isAdmin())
-        initAddUserDialog();           
+	    return;            
 	
 	var $thisTab = $("#right_panel_content").find("#tab_content_user");	    
 	$thisTab.find("#tab_container").hide(); 
diff --git a/ui/scripts/cloud.core.cluster.js b/ui/scripts/cloud.core.cluster.js
index e064298de05..bf0008023ba 100644
--- a/ui/scripts/cloud.core.cluster.js
+++ b/ui/scripts/cloud.core.cluster.js
@@ -17,19 +17,25 @@
  */
   
 function afterLoadClusterJSP($leftmenuItem1) {
-    clearAddButtonsOnTop();
+    var objCluster = $leftmenuItem1.data("jsonObj");
+    listMidMenuItems(("listHosts&type=Routing&clusterid="+objCluster.id), hostGetSearchParams, "listhostsresponse", "host", "jsp/host.jsp", afterLoadHostJSP, hostToMidmenu, hostToRightPanel, getMidmenuId, false, ("cluster_"+objCluster.id));    
+
+    /*
+    clearButtonsOnTop();
    
     initDialog("dialog_add_host");
     initDialog("dialog_add_pool");    
     bindEventHandlerToDialogAddPool($("#dialog_add_pool"));	       
     
 	clusterJsonToRightPanel($leftmenuItem1);	
+	*/
 }
 
+/*
 function clusterJsonToRightPanel($leftmenuItem1) {
     var objCluster = $leftmenuItem1.data("jsonObj");
     
-    clearAddButtonsOnTop();
+    clearButtonsOnTop();
     if(objCluster.clustertype == "CloudManaged")
     	initAddHostButton($("#midmenu_add_host_button"), "cluster_page", $leftmenuItem1);
     else 
@@ -42,7 +48,9 @@ function clusterJsonToRightPanel($leftmenuItem1) {
     $("#right_panel_content").data("$leftmenuItem1", $leftmenuItem1);
     clusterJsonToDetailsTab();    
 }
+*/
 
+/*
 function clusterJsonToDetailsTab() {	
     var $leftmenuItem1 = $("#right_panel_content").data("$leftmenuItem1");
     if($leftmenuItem1 == null)
@@ -71,4 +79,4 @@ function clusterJsonToDetailsTab() {
     $detailsTab.find("#zonename").text(fromdb(jsonObj.zonename));        
     $detailsTab.find("#podname").text(fromdb(jsonObj.podname));            
 }
-
+*/
diff --git a/ui/scripts/cloud.core.diskoffering.js b/ui/scripts/cloud.core.diskoffering.js
index b3adf7626dd..b59312fcbda 100644
--- a/ui/scripts/cloud.core.diskoffering.js
+++ b/ui/scripts/cloud.core.diskoffering.js
@@ -87,11 +87,8 @@ function initAddDiskOfferingDialog() {
 			} 
 		}
 	});   
-    
-    //add button ***
-    $("#midmenu_add_link").find("#label").text("Add Disk Offering"); 
-    $("#midmenu_add_link").show();     
-    $("#midmenu_add_link").unbind("click").bind("click", function(event) {    
+        
+    $("#add_diskoffering_button").unbind("click").bind("click", function(event) {    
 		$dialogAddDisk.find("#disk_name").val("");
 		$dialogAddDisk.find("#disk_description").val("");
 		$dialogAddDisk.find("#disk_disksize").val("");	
diff --git a/ui/scripts/cloud.core.domain.js b/ui/scripts/cloud.core.domain.js
index 8bbd4f972b3..a9c21c25ec0 100644
--- a/ui/scripts/cloud.core.domain.js
+++ b/ui/scripts/cloud.core.domain.js
@@ -119,8 +119,10 @@ function domainAccountJSONToTemplate(jsonObj, $template) {
 function afterLoadDomainJSP() {
     hideMiddleMenu();   
 	clearMiddleMenu();
-	clearAddButtonsOnTop();
-	   
+	
+	var $topButtonContainer = clearButtonsOnTop();			    	       
+	$("#top_buttons").appendTo($topButtonContainer); 
+		   
     if(isAdmin()) {
         initAddDomainDialog();
     }
@@ -136,12 +138,8 @@ function initAddDomainDialog() {
     initDialog("dialog_add_domain", 450);
     
     var $dialogAddDomain = $("#dialog_add_domain");              
-	
-    //add button ***
-    $("#midmenu_add_link").find("#label").text("Add Domain"); 
-    $("#midmenu_add_link").show();     
-    $("#midmenu_add_link").unbind("click").bind("click", function(event) {  
-    
+	   
+    $("#add_domain_button").unbind("click").bind("click", function(event) {     
         $dialogAddDomain.find("#add_domain_name").val("");
         
         $.ajax({
diff --git a/ui/scripts/cloud.core.host.js b/ui/scripts/cloud.core.host.js
index 4af8f406e88..578cc542bc9 100644
--- a/ui/scripts/cloud.core.host.js
+++ b/ui/scripts/cloud.core.host.js
@@ -117,8 +117,8 @@ function hostJsonToDetailsTab() {
     if(jsonObj == null)
         return;    
     
-    initAddHostButton($("#midmenu_add_host_button"), "host_page", $midmenuItem1); 
-    initAddPrimaryStorageButton($("#midmenu_add_primarystorage_button"), "host_page", $midmenuItem1);          
+    bindAddHostButton($("#add_host_button"), "host_page", $midmenuItem1); 
+    bindAddPrimaryStorageButton($("#add_primarystorage_button"), "host_page", $midmenuItem1);          
     
     $.ajax({
         data: createURL("command=listHosts&id="+jsonObj.id),
diff --git a/ui/scripts/cloud.core.init.js b/ui/scripts/cloud.core.init.js
index 35f95c01948..e5dd5bec972 100644
--- a/ui/scripts/cloud.core.init.js
+++ b/ui/scripts/cloud.core.init.js
@@ -52,7 +52,7 @@ $(document).ready(function() {
 	$("#leftmenu_dashboard").bind("click", function(event) {
 	    selectLeftMenu($(this), false, function() {
 			clearMiddleMenu();
-			clearAddButtonsOnTop();
+			clearButtonsOnTop();
 			hideMiddleMenu();
 			
 			$("#right_panel").data("onRefreshFn", function() {
@@ -135,7 +135,7 @@ $(document).ready(function() {
 		    selectLeftSubMenu($(this));		
 		    hideMiddleMenu();			
 	        clearMiddleMenu();
-			clearAddButtonsOnTop();
+			clearButtonsOnTop();
 		    	
 		    $("#right_panel").data("onRefreshFn", function() {
 		        $("#leftmenu_global_setting").click();
@@ -164,7 +164,7 @@ $(document).ready(function() {
 		$("#leftmenu_physical_resource").bind("click", function(event) {
 			showMiddleMenu();
 			clearMiddleMenu();
-			clearAddButtonsOnTop();
+			clearButtonsOnTop();
 		   
 			expandOrCollapseZoneTree();
 			
@@ -173,7 +173,7 @@ $(document).ready(function() {
 		    });
 							
 		    if(currentRightPanelJSP != "jsp/resource.jsp") {    
-                clearAddButtonsOnTop();  
+                clearButtonsOnTop();  
                 removeDialogs();
                 $("#right_panel").load("jsp/resource.jsp", function(){     
                     currentRightPanelJSP = "jsp/resource.jsp";
diff --git a/ui/scripts/cloud.core.instance.js b/ui/scripts/cloud.core.instance.js
index bb1fb1a2b2a..833b44acd94 100644
--- a/ui/scripts/cloud.core.instance.js
+++ b/ui/scripts/cloud.core.instance.js
@@ -98,16 +98,16 @@ function afterLoadInstanceJSP() {
 		//initialize VM Wizard  
 		$doTemplateNo = $("#vm_popup_disk_offering_template_no");
 		$doTemplateCustom = $("#vm_popup_disk_offering_template_custom");
-		$doTemplateExisting = $("#vm_popup_disk_offering_template_existing");
-		//initVMWizard(); 
+		$doTemplateExisting = $("#vm_popup_disk_offering_template_existing");		
 		vmPopulateDropdown();
 		init = true;
 	}
 	
-	initStartVMButton();    
-	initStopVMButton(); 
-	initRebootVMButton();    
-	initDestroyVMButton();
+	initVMWizard();
+	bindStartVMButton();    
+	bindStopVMButton(); 
+	bindRebootVMButton();    
+	bindDestroyVMButton();
 		
 	if (isAdmin() || isDomainAdmin())
 			$("#right_panel_content").find("#tab_router,#tab_router").show();
@@ -117,13 +117,7 @@ function afterLoadInstanceJSP() {
 	var tabContentArray = [$("#tab_content_details"), $("#tab_content_nic"), $("#tab_content_volume"), $("#tab_content_statistics"), $("#tab_content_router")];
 	var afterSwitchFnArray = [vmJsonToDetailsTab, vmJsonToNicTab, vmJsonToVolumeTab, vmJsonToStatisticsTab, vmJsonToRouterTab];
 	switchBetweenDifferentTabs(tabArray, tabContentArray, afterSwitchFnArray);   
-			
-	//Add VM button
-	var $midLinks = $("#midmenu_add_links_container");
-	$midLinks.find("#midmenu_add_link #label").text("Add VM"); 
-	$midLinks.find("#midmenu_add_link, #midmenu_startvm_link, #midmenu_stopvm_link, #midmenu_rebootvm_link, #midmenu_destroyvm_link").show(); 
-	initVMWizard();
-    
+			   
     // dialogs
     initDialog("dialog_detach_iso_from_vm");       	
    	initDialog("dialog_attach_iso");  
@@ -161,9 +155,8 @@ function afterLoadInstanceJSP() {
     }
 }
 
-function initStartVMButton() {
-    $("#midmenu_startvm_link").show();   
-    $("#midmenu_startvm_link").bind("click", function(event) {            
+function bindStartVMButton() {    
+    $("#start_vm_button").bind("click", function(event) {            
         var itemCounts = 0;
         for(var id in selectedItemsInMidMenu) {
             itemCounts ++;
@@ -211,9 +204,8 @@ function initStartVMButton() {
     }); 	
 }
 
-function initStopVMButton() {
-    $("#midmenu_stopvm_link").show();   
-    $("#midmenu_stopvm_link").bind("click", function(event) {            
+function bindStopVMButton() {       
+    $("#stop_vm_button").bind("click", function(event) {            
         var itemCounts = 0;
         for(var id in selectedItemsInMidMenu) {
             itemCounts ++;
@@ -260,9 +252,8 @@ function initStopVMButton() {
     }); 	
 }
 
-function initRebootVMButton() {
-    $("#midmenu_rebootvm_link").show();   
-    $("#midmenu_rebootvm_link").bind("click", function(event) {            
+function bindRebootVMButton() {   
+    $("#reboot_vm_button").bind("click", function(event) {            
         var itemCounts = 0;
         for(var id in selectedItemsInMidMenu) {
             itemCounts ++;
@@ -309,9 +300,8 @@ function initRebootVMButton() {
     }); 
 }
 
-function initDestroyVMButton() {
-    $("#midmenu_destroyvm_link").show();   
-    $("#midmenu_destroyvm_link").bind("click", function(event) {            
+function bindDestroyVMButton() {    
+    $("#destroy_vm_button").bind("click", function(event) {            
         var itemCounts = 0;
         for(var id in selectedItemsInMidMenu) {
             itemCounts ++;
@@ -380,7 +370,7 @@ var vmPopupTemplatePageSize = 6; //max number of templates in VM wizard
 var currentStepInVmPopup = 1;
 function initVMWizard() {
     $vmPopup = $("#vm_popup");  
-    $("#midmenu_add_link").unbind("click").bind("click", function(event) {
+    $("#add_vm_button").unbind("click").bind("click", function(event) {
         vmWizardOpen();			
 	    $.ajax({
 		    data: createURL("command=listZones&available=true"),
diff --git a/ui/scripts/cloud.core.ipaddress.js b/ui/scripts/cloud.core.ipaddress.js
index ed3e3121d8e..bbfe13a543d 100644
--- a/ui/scripts/cloud.core.ipaddress.js
+++ b/ui/scripts/cloud.core.ipaddress.js
@@ -82,10 +82,8 @@ function afterLoadIpJSP() {
 		    }
 		}
 	});
-	
-	$("#midmenu_add_link").find("#label").text("Acquire New IP"); 
-	$("#midmenu_add_link").show();     
-    $("#midmenu_add_link").unbind("click").bind("click", function(event) {  
+	    
+    $("#acquire_new_ip_button").unbind("click").bind("click", function(event) {  
 		var submenuContent = $("#submenu_content_network");
 		$("#dialog_acquire_public_ip").dialog('option', 'buttons', {				
 			"Acquire": function() { 
diff --git a/ui/scripts/cloud.core.iso.js b/ui/scripts/cloud.core.iso.js
index 04d2294ebfa..0bfd4a66f88 100644
--- a/ui/scripts/cloud.core.iso.js
+++ b/ui/scripts/cloud.core.iso.js
@@ -112,10 +112,8 @@ function initAddIsoDialog() {
 		}
 	});
     
-    //add button ***
-    $("#midmenu_add_link").find("#label").text("Add ISO"); 
-    $("#midmenu_add_link").show();     
-    $("#midmenu_add_link").unbind("click").bind("click", function(event) {     
+    //add button ***     
+    $("#add_iso_button").unbind("click").bind("click", function(event) {     
         $dialogAddIso
 	    .dialog('option', 'buttons', { 				
 		    "Create": function() { 	
diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js
index 8a9a44b503c..74830a50e32 100644
--- a/ui/scripts/cloud.core.js
+++ b/ui/scripts/cloud.core.js
@@ -552,8 +552,7 @@ function setBooleanEditField(value, $field) {
 
 function clearMiddleMenu() {
     $("#midmenu_container").empty();
-    $("#midmenu_action_link").hide();
-    //clearAddButtonsOnTop();        
+    $("#midmenu_action_link").hide();    
     lastSearchType = null;
     $("#basic_search").find("#search_input").val("");
     $("#advanced_search_icon").removeClass("on");
@@ -562,32 +561,8 @@ function clearMiddleMenu() {
     $("#middle_menu_pagination").data("params", null);
 }
 
-function clearAddButtonsOnTop() {
-	// This button is re-used by all pages
-	var $addLinksContainer = $("#midmenu_add_links_container");
-    var addButton = $addLinksContainer.find("#midmenu_add_link").unbind("click").hide(); 
-    
-	$addLinksContainer.children().each(function() {
-		$(this).unbind("click").hide();
-	});
-	/*
-    $("#midmenu_add_zone_button").unbind("click").hide();   
-    $("#midmenu_add_host_button").unbind("click").hide();   
-    $("#midmenu_add_primarystorage_button").unbind("click").hide(); 
-    $("#midmenu_add_secondarystorage_button").unbind("click").hide(); 
-    $("#midmenu_add_pod_button").unbind("click").hide(); 
-    $("#midmenu_add_vlan_button").unbind("click").hide(); 
-    $("#midmenu_add_network_button").unbind("click").hide(); 
-    $("#midmenu_add_iprange_button").unbind("click").hide(); 
-    $("#midmenu_add_external_firewall_button").unbind("click").hide(); 
-    $("#midmenu_add_load_balancer_button").unbind("click").hide(); 
-    $("#midmenu_Update_SSL_Certificate_button").unbind("click").hide();   
-         
-    $("#midmenu_startvm_link").hide();     
-    $("#midmenu_stopvm_link").hide(); 
-    $("#midmenu_rebootvm_link").hide(); 
-    $("#midmenu_destroyvm_link").hide(); 
-	*/
+function clearButtonsOnTop() {
+	return $("#top_button_container").empty(); 
 }
 
 function clearRightPanel() {
@@ -1013,6 +988,12 @@ function listMidMenuItems(commandString, getSearchParamsFn, jsonResponse1, jsonR
 	if (currentRightPanelJSP != rightPanelJSP) {
 		$("#right_panel").load(rightPanelJSP, function(){     
 		    currentRightPanelJSP = rightPanelJSP;
+		    
+		    var $topButtonContainer = clearButtonsOnTop();			    	       
+		    $("#top_buttons").appendTo($topButtonContainer); 
+		    
+			removeDialogs();			
+								    
 			var $actionLink = $("#right_panel_content #tab_content_details #action_link");
 			$actionLink.bind("mouseover", function(event) {	    
 				$(this).find("#action_menu").show();    
@@ -1022,8 +1003,7 @@ function listMidMenuItems(commandString, getSearchParamsFn, jsonResponse1, jsonR
 				$(this).find("#action_menu").hide();    
 				return false;
 			});	   
-			removeDialogs();
-			clearAddButtonsOnTop();
+			
 			afterLoadRightPanelJSPFn();                
 			listMidMenuItems2(commandString, getSearchParamsFn, jsonResponse1, jsonResponse2, toMidmenuFn, toRightPanelFn, getMidmenuIdFn, isMultipleSelectionInMidMenu, 1);   			
 		});     
diff --git a/ui/scripts/cloud.core.network.js b/ui/scripts/cloud.core.network.js
index aa2d42fc637..2e4221f268a 100644
--- a/ui/scripts/cloud.core.network.js
+++ b/ui/scripts/cloud.core.network.js
@@ -47,7 +47,10 @@ var zoneObj;
 function afterLoadNetworkJSP($leftmenuItem1) {        
     showMiddleMenu();    
     
-    initAddNetworkButton($("#midmenu_add_network_button"));
+    var $topButtonContainer = clearButtonsOnTop();			    	       
+	$("#top_buttons").appendTo($("#top_button_container").empty()); 
+    
+    bindAddNetworkButton($("#add_network_button"));
     
     //switch between different tabs - Public Network page
     var $publicNetworkPage = $("#public_network_page");
@@ -129,9 +132,9 @@ function publicNetworkToRightPanel($midmenuItem1) {
     $("#right_panel_content").data("$midmenuItem1", $midmenuItem1);  
             
     $("#public_network_page").show();    
-    initAddIpRangeToPublicNetworkButton($("#midmenu_add_iprange_button"), $midmenuItem1);
-    initAddExternalFirewallButton($("#midmenu_add_external_firewall_button"), $midmenuItem1);
-    initAddLoadBalancerButton($("#midmenu_add_load_balancer_button"), $midmenuItem1);
+    bindAddIpRangeToPublicNetworkButton($("#add_iprange_button"), $midmenuItem1);
+    bindAddExternalFirewallButton($("#add_external_firewall_button"), $midmenuItem1);
+    bindAddLoadBalancerButton($("#add_load_balancer_button"), $midmenuItem1);
     
     $("#direct_network_page").hide();
     
@@ -374,7 +377,7 @@ var publicNetworkLoadBalancerActionMap = {
     }     
 }  
 
-function initAddIpRangeToPublicNetworkButton($button, $midmenuItem1) {   
+function bindAddIpRangeToPublicNetworkButton($button, $midmenuItem1) {   
     var jsonObj = $midmenuItem1.data("jsonObj");      
     
     var $dialogAddIpRangeToPublicNetwork = $("#dialog_add_iprange_to_publicnetwork"); 
@@ -570,7 +573,7 @@ function initAddIpRangeToPublicNetworkButton($button, $midmenuItem1) {
     });
 }
 
-function initAddExternalFirewallButton($button, $midmenuItem1) {         
+function bindAddExternalFirewallButton($button, $midmenuItem1) {         
     var jsonObj = $midmenuItem1.data("jsonObj");      
     
     var $dialogAddExternalFirewall = $("#dialog_add_external_firewall"); 
@@ -715,7 +718,7 @@ var publicNetworkIpRangeActionMap = {
 }  
 
 
-function initAddLoadBalancerButton($button, $midmenuItem1) {         
+function bindAddLoadBalancerButton($button, $midmenuItem1) {         
     var jsonObj = $midmenuItem1.data("jsonObj");      
     
     var $dialogAddLoadBalancer = $("#dialog_add_load_balancer"); 
@@ -846,9 +849,9 @@ function directNetworkToRightPanel($midmenuItem1) {
     $("#right_panel_content").data("$midmenuItem1", $midmenuItem1);  
             
     $("#direct_network_page").show();
-    initAddIpRangeToDirectNetworkButton($("#midmenu_add_iprange_button"), $midmenuItem1);
-    $("#midmenu_add_external_firewall_button").unbind("click").hide(); 
-    $("#midmenu_add_load_balancer_button").unbind("click").hide(); 
+    bindAddIpRangeToDirectNetworkButton($("#add_iprange_button"), $midmenuItem1);
+    $("#add_external_firewall_button").unbind("click").hide(); 
+    $("#add_load_balancer_button").unbind("click").hide(); 
     
     $("#public_network_page").hide();
     
@@ -996,7 +999,7 @@ var directNetworkIpRangeActionMap = {
     }    
 }  
 
-function initAddNetworkButton($button) {   
+function bindAddNetworkButton($button) {   
     if(zoneObj == null)
         return;
     
@@ -1194,7 +1197,7 @@ function initAddNetworkButton($button) {
     });
 }
 
-function initAddIpRangeToDirectNetworkButton($button, $midmenuItem1) {   
+function bindAddIpRangeToDirectNetworkButton($button, $midmenuItem1) {   
     var jsonObj = $midmenuItem1.data("jsonObj");       
         
     var $dialogAddIpRangeToDirectNetwork = $("#dialog_add_iprange_to_directnetwork");     
diff --git a/ui/scripts/cloud.core.pod.js b/ui/scripts/cloud.core.pod.js
index 1653284a654..dbcbc151fde 100644
--- a/ui/scripts/cloud.core.pod.js
+++ b/ui/scripts/cloud.core.pod.js
@@ -19,6 +19,9 @@
  function afterLoadPodJSP($leftmenuItem1) {   
     hideMiddleMenu();	
  
+    var $topButtonContainer = clearButtonsOnTop();			    	       
+	$("#top_buttons").appendTo($topButtonContainer); 
+ 
     initDialog("dialog_add_external_cluster");
     initDialog("dialog_add_host");
     initDialog("dialog_add_pool");
@@ -39,9 +42,9 @@
 }
 
 function podJsonToRightPanel($leftmenuItem1) {	    
-    initAddClusterButton($("#midmenu_add_cluster_button"), "pod_page", $leftmenuItem1); 
-    initAddHostButton($("#midmenu_add_host_button"), "pod_page", $leftmenuItem1); 
-    initAddPrimaryStorageButton($("#midmenu_add_primarystorage_button"), "pod_page", $leftmenuItem1);  
+    bindAddClusterButton($("#add_cluster_button"), "pod_page", $leftmenuItem1); 
+    bindAddHostButton($("#add_host_button"), "pod_page", $leftmenuItem1); 
+    bindAddPrimaryStorageButton($("#add_primarystorage_button"), "pod_page", $leftmenuItem1);  
            
     $("#right_panel_content").data("$leftmenuItem1", $leftmenuItem1);  
     $("#tab_details").click();   
@@ -105,7 +108,7 @@ function podJsonToDetailsTab() {
 	});	
     if(networkType == "Basic") { //basic-mode network (pod-wide VLAN)
         $("#tab_network").show();  
-        initAddPodVLANButton($("#midmenu_add_directIpRange_button"), $leftmenuItem1);  
+        bindAddPodVLANButton($("#midmenu_add_directIpRange_button"), $leftmenuItem1);  
     }
     else if(networkType == "Advanced") { //advanced-mode network (zone-wide VLAN)
         $("#tab_network").hide();
@@ -270,7 +273,7 @@ function refreshClsuterFieldInAddHostDialog(dialogAddHost, podId, clusterId, hyp
     });     
 }      
 
-function initAddClusterButton($button, currentPageInRightPanel, $leftmenuItem1) {
+function bindAddClusterButton($button, currentPageInRightPanel, $leftmenuItem1) {
     $button.show();
     $button.unbind("click").bind("click", function(event) {
         dialogAddCluster = $("#dialog_add_external_cluster");      
@@ -383,7 +386,7 @@ function initAddClusterButton($button, currentPageInRightPanel, $leftmenuItem1)
     });
 }
 
-function initAddHostButton($button, currentPageInRightPanel, $leftmenuItem1) {    
+function bindAddHostButton($button, currentPageInRightPanel, $leftmenuItem1) {    
     $button.show();
     $button.unbind("click").bind("click", function(event) {     
         dialogAddHost = $("#dialog_add_host");      
@@ -579,7 +582,7 @@ function clickClusterNodeAfterAddHost(clusterRadio, podId, newClusterName, exist
     }         
 }
 
-function initAddPrimaryStorageButton($button, currentPageInRightPanel, $leftmenuItem1) {    
+function bindAddPrimaryStorageButton($button, currentPageInRightPanel, $leftmenuItem1) {    
     $button.show();   
     $button.unbind("click").bind("click", function(event) {   
         if($("#tab_content_primarystorage").length > 0 && $("#tab_content_primarystorage").css("display") == "none")
@@ -728,7 +731,7 @@ function initAddPrimaryStorageButton($button, currentPageInRightPanel, $leftmenu
     });             
 }
 
-function initAddPodVLANButton($button, $leftmenuItem1) {    
+function bindAddPodVLANButton($button, $leftmenuItem1) {    
     $button.find("#label").text("Add Direct IP Range"); 
     $button.show();   
     $button.unbind("click").bind("click", function(event) {   
diff --git a/ui/scripts/cloud.core.resource.js b/ui/scripts/cloud.core.resource.js
index 26fd3b7af8f..571cfd7e19f 100644
--- a/ui/scripts/cloud.core.resource.js
+++ b/ui/scripts/cloud.core.resource.js
@@ -81,8 +81,7 @@ function buildZoneTree() {
 			default:				    		    
 			    selectRowInZoneTree($(this).find("#zone_header"));	
 			    
-			    if(currentRightPanelJSP != "jsp/zone.jsp") {    
-                    clearAddButtonsOnTop();  
+			    if(currentRightPanelJSP != "jsp/zone.jsp") {                       
 	                removeDialogs();
 	                
 	                var $thisNode = $(this);
@@ -108,8 +107,7 @@ function buildZoneTree() {
 	$("#network_header").unbind("click").bind("click", function(event) {	   
 	    selectRowInZoneTree($(this));	
 	    
-        if(currentRightPanelJSP != "jsp/network.jsp") {    
-            clearAddButtonsOnTop();  
+        if(currentRightPanelJSP != "jsp/network.jsp") {            
             removeDialogs();
             
             var $thisNode = $(this);    
@@ -157,8 +155,7 @@ function buildZoneTree() {
 			default:			
 			    selectRowInZoneTree($(this).find("#pod_header"));	    
 	            
-	            if(currentRightPanelJSP != "jsp/pod.jsp") {    
-                    clearAddButtonsOnTop();  
+	            if(currentRightPanelJSP != "jsp/pod.jsp") {                     
 	                removeDialogs();
 	                
 	                var $thisNode = $(this); 
@@ -183,8 +180,7 @@ function buildZoneTree() {
 	$("#leftmenu_cluster_node_template").unbind("click").bind("click", function(event) {
 	    selectRowInZoneTree($(this).find("#cluster_header"));	    
 	    
-        if(currentRightPanelJSP != "jsp/cluster.jsp") {    
-            clearAddButtonsOnTop();  
+        if(currentRightPanelJSP != "jsp/cluster.jsp") {            
             removeDialogs();
             
             var $thisNode = $(this); 
@@ -301,13 +297,14 @@ function clusterJSONToTreeNode(json, $clusterNode) {
 
 function afterLoadResourceJSP() {
     hideMiddleMenu();        
+     
+    var $topButtonContainer = clearButtonsOnTop();			    	       
+	$("#top_buttons").appendTo($topButtonContainer);  
         
-    $("#midmenu_add_zone_button").show();   
-    
     initAddZoneWizard();  
 	initAddZoneLinks();	 
     
-	initUpdateConsoleCertButton($("#midmenu_Update_SSL_Certificate_button"));
+	initUpdateConsoleCertButton($("#Update_SSL_Certificate_button"));
 	
 	initDialog("dialog_update_cert", 450);	
 	initDialog("dialog_add_pod_in_resource_page", 320); 	
@@ -590,7 +587,7 @@ function initAddHostShortcut() {
 }      
 
 function initAddZoneLinks() {     
-    $("#add_zone_shortcut,#midmenu_add_zone_button").unbind("click").bind("click", function(event) {              
+    $("#add_zone_shortcut,#add_zone_button").unbind("click").bind("click", function(event) {              
         if($("#leftmenu_physical_resource").find("#physical_resource_arrow").hasClass("expanded_close") == true)
 			expandOrCollapseZoneTree(); //if Physical Resource arrow shows closed (i.e. zonetree is hidden), expand and show zonetree.    
 			       
diff --git a/ui/scripts/cloud.core.securitygroup.js b/ui/scripts/cloud.core.securitygroup.js
index 1fc4b4d472c..f50f373035b 100644
--- a/ui/scripts/cloud.core.securitygroup.js
+++ b/ui/scripts/cloud.core.securitygroup.js
@@ -57,10 +57,8 @@ function initAddSecurityGroupDialog() {
     var $dialogAddSecurityGroup = $("#dialog_add_security_group");
     var $detailsTab = $("#right_panel_content").find("#tab_content_details");             
      
-    //add button ***
-    $("#midmenu_add_link").find("#label").text("Add Security Group"); 
-    $("#midmenu_add_link").show();     
-    $("#midmenu_add_link").unbind("click").bind("click", function(event) {    
+    //add button ***        
+    $("#add_securitygroup_button").unbind("click").bind("click", function(event) {    
         $dialogAddSecurityGroup
 	    .dialog('option', 'buttons', {
 	        "Create": function() {		            	          
diff --git a/ui/scripts/cloud.core.serviceoffering.js b/ui/scripts/cloud.core.serviceoffering.js
index 7dafd71377a..17915d97991 100644
--- a/ui/scripts/cloud.core.serviceoffering.js
+++ b/ui/scripts/cloud.core.serviceoffering.js
@@ -75,11 +75,8 @@ function initAddServiceOfferingDialog() {
 			} 
 		}
 	});   
-		 
-    //add button ***
-    $("#midmenu_add_link").find("#label").text("Add Service Offering"); 
-    $("#midmenu_add_link").show();     
-    $("#midmenu_add_link").unbind("click").bind("click", function(event) {    
+		         
+    $("#add_serviceoffering_button").unbind("click").bind("click", function(event) {    
 		$dialogAddService.find("#add_service_name").val("");
 		$dialogAddService.find("#add_service_display").val("");
 		$dialogAddService.find("#add_service_cpucore").val("");
diff --git a/ui/scripts/cloud.core.template.js b/ui/scripts/cloud.core.template.js
index e7927a0955d..0e360d854c3 100644
--- a/ui/scripts/cloud.core.template.js
+++ b/ui/scripts/cloud.core.template.js
@@ -81,10 +81,8 @@ function afterLoadTemplateJSP() {
 	else
 	    $("#dialog_add_template #add_template_featured_container, #dialog_edit_template #edit_template_featured_container").hide();		
 	
-	//add button ***
-	$("#midmenu_add_link").find("#label").text("Add Template"); 
-    $("#midmenu_add_link").show();     
-    $("#midmenu_add_link").unbind("click").bind("click", function(event) {        
+	//add button ***	   
+    $("#add_template_button").unbind("click").bind("click", function(event) {        
         $("#dialog_add_template")
 		.dialog('option', 'buttons', { 				
 			"Create": function() { 		
diff --git a/ui/scripts/cloud.core.volume.js b/ui/scripts/cloud.core.volume.js
index bf7b7a9d152..5f3bd8b9c31 100644
--- a/ui/scripts/cloud.core.volume.js
+++ b/ui/scripts/cloud.core.volume.js
@@ -118,10 +118,8 @@ function afterLoadVolumeJSP() {
         }      
     });  
       
-    //add button ***
-    $("#midmenu_add_link").find("#label").text("Add Volume"); 
-    $("#midmenu_add_link").show();     
-    $("#midmenu_add_link").unbind("click").bind("click", function(event) {   
+    //add volume button ***      
+    $("#add_volume_button").unbind("click").bind("click", function(event) {   
         $("#dialog_add_volume")
 	    .dialog('option', 'buttons', { 			    
 		    "Add": function() { 
diff --git a/ui/scripts/cloud.core.zone.js b/ui/scripts/cloud.core.zone.js
index 455a66f2d5f..a43e06818d2 100644
--- a/ui/scripts/cloud.core.zone.js
+++ b/ui/scripts/cloud.core.zone.js
@@ -19,6 +19,9 @@
  function afterLoadZoneJSP($leftmenuItem1) {
     hideMiddleMenu();  
         
+    var $topButtonContainer = clearButtonsOnTop();			    	       
+	$("#top_buttons").appendTo($topButtonContainer);     
+        
     initDialog("dialog_add_external_cluster_in_zone_page");
     initDialog("dialog_add_pod", 320); 
     initDialog("dialog_add_vlan_for_zone");
@@ -40,9 +43,9 @@
 }
 
 function zoneJsonToRightPanel($leftmenuItem1) {	                  
-    initAddPodButton($("#midmenu_add_pod_button"), $leftmenuItem1);                  
-    initAddVLANButton($("#midmenu_add_vlan_button"), $leftmenuItem1);
-    initAddSecondaryStorageButton($("#midmenu_add_secondarystorage_button"), $leftmenuItem1);
+    bindAddPodButton($("#add_pod_button"), $leftmenuItem1);                  
+    //bindAddVLANButton($("#add_vlan_button"), $leftmenuItem1);
+    bindAddSecondaryStorageButton($("#add_secondarystorage_button"), $leftmenuItem1);
           
     var pods;
     var zoneObj = $leftmenuItem1.data("jsonObj");
@@ -58,9 +61,9 @@ function zoneJsonToRightPanel($leftmenuItem1) {
         }        
     });
     if(pods != null && pods.length > 0) {
-        initAddClusterButtonOnZonePage($("#midmenu_add_cluster_button"), zoneId, zoneName); 
-        initAddHostButtonOnZonePage($("#midmenu_add_host_button"), zoneId, zoneName); 
-        initAddPrimaryStorageButtonOnZonePage($("#midmenu_add_primarystorage_button"), zoneId, zoneName);  
+        bindAddClusterButtonOnZonePage($("#add_cluster_button"), zoneId, zoneName); 
+        bindAddHostButtonOnZonePage($("#add_host_button"), zoneId, zoneName); 
+        bindAddPrimaryStorageButtonOnZonePage($("#add_primarystorage_button"), zoneId, zoneName);  
     }
 
     $("#right_panel_content").data("$leftmenuItem1", $leftmenuItem1);      
@@ -372,7 +375,7 @@ function vlanJsonToTemplate(jsonObj, $template1, isNetwork) {
 } 	
 
 
-function initAddVLANButton($button, $leftmenuItem1) {    
+function bindAddVLANButton($button, $leftmenuItem1) {    
     $button.show();   
     $button.unbind("click").bind("click", function(event) {  
         if($("#tab_content_network").css("display") == "none")
@@ -572,7 +575,7 @@ function initAddVLANButton($button, $leftmenuItem1) {
 }
 
 
-function initAddSecondaryStorageButton($button, $leftmenuItem1) {    
+function bindAddSecondaryStorageButton($button, $leftmenuItem1) {    
     $button.show();      
     $button.unbind("click").bind("click", function(event) {
         if($("#tab_content_secondarystorage").css("display") == "none")
@@ -629,7 +632,7 @@ function initAddSecondaryStorageButton($button, $leftmenuItem1) {
     });
 }
 
-function initAddPodButton($button, $leftmenuItem1) {
+function bindAddPodButton($button, $leftmenuItem1) {
     $button.show();     
     $button.unbind("click").bind("click", function(event) {   
         var zoneObj = $leftmenuItem1.data("jsonObj"); 
@@ -980,13 +983,14 @@ function doEditZone2($actionLink, $detailsTab, $leftmenuItem1, $readonlyFields,
 }
 
 
-function initAddClusterButtonOnZonePage($button, zoneId, zoneName) {
+function bindAddClusterButtonOnZonePage($button, zoneId, zoneName) {
     $button.show();
     $button.unbind("click").bind("click", function(event) {
         $dialogAddCluster = $("#dialog_add_external_cluster_in_zone_page");      
-        $dialogAddCluster.find("#info_container").hide();    
-        var $podSelect = $dialogAddCluster.find("#pod_dropdown");
-    	
+        $dialogAddCluster.find("#info_container").hide();          
+        $dialogAddCluster.find("#zone_name").text(zoneName);
+         
+        var $podSelect = $dialogAddCluster.find("#pod_dropdown");    	
         $.ajax({
             data: createURL("command=listPods&zoneid="+zoneId),
             dataType: "json",
@@ -1105,7 +1109,7 @@ function initAddClusterButtonOnZonePage($button, zoneId, zoneName) {
 }
 
 
-function initAddHostButtonOnZonePage($button, zoneId, zoneName) {
+function bindAddHostButtonOnZonePage($button, zoneId, zoneName) {
     $button.show();
    
     var $dialogAddHost = $("#dialog_add_host_in_zone_page");   
@@ -1295,7 +1299,7 @@ function initAddHostButtonOnZonePage($button, zoneId, zoneName) {
     });  
 }      
 
-function initAddPrimaryStorageButtonOnZonePage($button, zoneId, zoneName) {
+function bindAddPrimaryStorageButtonOnZonePage($button, zoneId, zoneName) {
     $button.show();
 
 	var $dialogAddPool = $("#dialog_add_pool_in_zone_page");