diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 929d752b411..948038c2e9b 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -4,6 +4,11 @@
 
 
 #Labels
+network.rate=Network Rate
+
+ICMP.type=ICMP Type
+ICMP.code=ICMP Code
+
 image.directory=Image Directory
 
 label.action.create.template.from.vm=Create Template from VM
diff --git a/client/WEB-INF/classes/resources/messages_es.properties b/client/WEB-INF/classes/resources/messages_es.properties
index 0895551cf0c..248dc748b81 100644
--- a/client/WEB-INF/classes/resources/messages_es.properties
+++ b/client/WEB-INF/classes/resources/messages_es.properties
@@ -4,6 +4,9 @@
 
 
 #Labels
+ICMP.type=Tipo ICMP
+ICMP.code=ICMP Código
+
 image.directory=Directorio de la imagen
 
 label.action.create.template.from.vm=Crear plantilla de VM
diff --git a/client/WEB-INF/classes/resources/messages_ja.properties b/client/WEB-INF/classes/resources/messages_ja.properties
index 23cbf984189..623da86ac8c 100644
--- a/client/WEB-INF/classes/resources/messages_ja.properties
+++ b/client/WEB-INF/classes/resources/messages_ja.properties
@@ -4,6 +4,9 @@
 
 
 #Labels
+ICMP.type=ICMPタイプ
+ICMP.code=ICMPコード
+
 image.directory=画像ディレクトリ
 
 label.action.create.template.from.vm=VMからのテンプレートを作成する
diff --git a/client/WEB-INF/classes/resources/messages_zh_CN.properties b/client/WEB-INF/classes/resources/messages_zh_CN.properties
index 7827a075f4b..a4b3dc4be66 100644
--- a/client/WEB-INF/classes/resources/messages_zh_CN.properties
+++ b/client/WEB-INF/classes/resources/messages_zh_CN.properties
@@ -4,6 +4,9 @@
 
 
 #Labels
+ICMP.type=ICMP类型
+ICMP.code=ICMP代码
+
 image.directory=图片目录
 
 label.action.create.template.from.vm=创建虚拟机模板
diff --git a/ui/jsp/host.jsp b/ui/jsp/host.jsp
index dc75f9f2c8d..92183facb53 100644
--- a/ui/jsp/host.jsp
+++ b/ui/jsp/host.jsp
@@ -111,8 +111,18 @@ dictionary = {
 	                    <div class="row_celltitles" id="state">
 	                    </div>
 	                </div>
-	            </div>
+	            </div>	            
 	            <div class="grid_rows even">
+	                <div class="grid_row_cell" style="width: 20%;">
+	                    <div class="row_celltitles">
+	                        <fmt:message key="label.host.tags"/>:</div>
+	                </div>
+	                <div class="grid_row_cell" style="width: 79%;">
+	                    <div class="row_celltitles" id="hosttags">
+	                    </div>
+	                </div>
+	            </div>
+	            <div class="grid_rows odd">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
 	                        <fmt:message key="label.type"/>:</div>
@@ -122,7 +132,7 @@ dictionary = {
 	                    </div>
 	                </div>
 	            </div>
-	            <div class="grid_rows odd">
+	            <div class="grid_rows even">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
 	                        <fmt:message key="label.zone"/>:</div>
@@ -132,7 +142,7 @@ dictionary = {
 	                    </div>
 	                </div>
 	            </div>
-	            <div class="grid_rows even">
+	            <div class="grid_rows odd">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
 	                        <fmt:message key="label.pod"/>:</div>
@@ -142,7 +152,7 @@ dictionary = {
 	                    </div>
 	                </div>
 	            </div>
-	            <div class="grid_rows odd">
+	            <div class="grid_rows even">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
 	                        <fmt:message key="label.cluster"/>:</div>
@@ -152,7 +162,7 @@ dictionary = {
 	                    </div>
 	                </div>
 	            </div>
-	            <div class="grid_rows even">
+	            <div class="grid_rows odd">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
 	                        <fmt:message key="label.ip.address"/>:</div>
@@ -162,7 +172,7 @@ dictionary = {
 	                    </div>
 	                </div>
 	            </div>
-	            <div class="grid_rows odd">
+	            <div class="grid_rows even">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
 	                        <fmt:message key="label.version"/>:</div>
@@ -172,7 +182,7 @@ dictionary = {
 	                    </div>
 	                </div>
 	            </div>
-	            <div class="grid_rows even">
+	            <div class="grid_rows odd">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
 	                        <fmt:message key="label.os.preference"/>:</div>
@@ -182,7 +192,7 @@ dictionary = {
 	                    </div>
 	                </div>
 	            </div>
-	            <div class="grid_rows odd">
+	            <div class="grid_rows even">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
 	                        <fmt:message key="label.last.disconnected"/>:</div>
diff --git a/ui/jsp/ipaddress.jsp b/ui/jsp/ipaddress.jsp
index a0b4252d64e..5ea52ec3050 100644
--- a/ui/jsp/ipaddress.jsp
+++ b/ui/jsp/ipaddress.jsp
@@ -32,8 +32,10 @@ dictionary = {
         </p>
     </div>
     <div class="tabbox" style="margin-top: 15px;">
-        <div class="content_tabs on" id="tab_details">
-            <fmt:message key="label.details"/></div>	            
+        <div class="content_tabs on" id="tab_details" style="display: none">
+            <fmt:message key="label.details"/></div>	
+        <div class="content_tabs off" id="tab_firewall" style="display: none">
+            <fmt:message key="label.firewall"/></div>	
         <div class="content_tabs off" id="tab_port_range" style="display: none">
             <fmt:message key="label.port.range"/></div>            	
 		<div class="content_tabs off" id="tab_port_forwarding" style="display: none">
@@ -43,7 +45,9 @@ dictionary = {
 		<div class="content_tabs off" id="tab_vpn" style="display: none">
             <fmt:message key="label.vpn"/></div>
     </div>  
-    <div id="tab_content_details">
+    
+    <!-- Details starts here-->
+    <div id="tab_content_details" style="display: none">
     	<div id="tab_spinning_wheel" class="rightpanel_mainloader_panel" style="display: none;">
 	        <div class="rightpanel_mainloaderbox">
 	            <div class="rightpanel_mainloader_animatedicon">
@@ -215,6 +219,86 @@ dictionary = {
         </div>        
     </div>
     <!-- Details ends here-->
+    
+    <!-- Firewall start here-->
+    <div id="tab_content_firewall" style="display:none">
+    	<div id="tab_spinning_wheel" class="rightpanel_mainloader_panel" style="display: none;">
+            <div class="rightpanel_mainloaderbox">
+                <div class="rightpanel_mainloader_animatedicon">
+                </div>
+                <p>
+                    <fmt:message key="label.loading"/> &hellip;</p>
+            </div>
+        </div>        
+        <div id="tab_container">
+	        <div class="grid_container" id="grid_container">
+	            <div class="grid_header">	                
+	                <div class="grid_header_cell" style="padding:1px; width: 30%; ">
+	                    <div class="grid_header_title">
+	                        <fmt:message key="label.cidr.list"/></div>
+	                </div>	
+	                <div class="grid_header_cell" style="padding:1px; width: 15%; ">
+	                    <div class="grid_header_title">
+	                        <fmt:message key="label.protocol"/></div>
+	                </div>	 
+	                <div class="grid_header_cell" style="padding:1px; width: 10%; ">
+	                    <div class="grid_header_title">
+	                        <fmt:message key="label.start.port"/></div>
+	                </div>
+	                <div class="grid_header_cell" style="padding:1px; width: 10%; ">
+	                    <div class="grid_header_title">
+	                        <fmt:message key="label.end.port"/></div>
+	                </div>	              	                
+	                <div class="grid_header_cell" style="padding:1px; width: 10%; ">
+	                    <div class="grid_header_title">
+	                        <fmt:message key="ICMP.type"/></div>
+	                </div>
+	                 <div class="grid_header_cell" style="padding:1px; width: 10%; ">
+	                    <div class="grid_header_title">
+	                        <fmt:message key="ICMP.code"/></div>
+	                </div>
+	                <div class="grid_header_cell" style="padding:1px; width: 10%; ">
+	                    <div class="grid_header_title">
+	                        <fmt:message key="label.actions"/></div>
+	                </div>
+	            </div>
+	            <div class="grid_rows even" id="create_firewall_row">	            
+	                <div class="grid_row_cell" style="padding:1px; width: 30%; ">  
+	                    <input id="cidr" class="text" type="text" />
+	                    <div id="cidr_errormsg" class="errormsg" style="display: none;"></div>
+	                </div>	
+	                <div class="grid_row_cell" style="padding:1px; width: 15%; ">  
+	                   <select class="select" id="protocol" style="width:70%;">	                  
+	                   </select>
+	                </div>	 	
+	                <div class="grid_row_cell" style="padding:1px; width: 10%; ">
+	                    <input id="start_port" class="text" style="width: 70%;" type="text" />
+	                    <div id="start_port_errormsg" class="errormsg" style="display: none;"></div>
+	                </div>
+	                <div class="grid_row_cell" style="padding:1px; width: 10%; ">
+	                    <input id="end_port" class="text" style="width: 70%;" type="text" />
+	                    <div id="end_port_errormsg" class="errormsg" style="display: none;"></div>
+	                </div>	                               
+	                <div class="grid_row_cell" style="padding:1px; width: 10%; ">
+	                    <input id="ICMP_type" class="text" style="width: 70%;" type="text" />
+	                    <div id="ICMP_type_errormsg" class="errormsg" style="display: none;"></div>
+	                </div>
+	                <div class="grid_row_cell" style="padding:1px; width: 10%; ">
+	                    <input id="ICMP_code" class="text" style="width: 70%;" type="text" />
+	                    <div id="ICMP_code_errormsg" class="errormsg" style="display: none;"></div>
+	                </div>
+	                <div class="grid_row_cell" style="padding:1px; width: 10%; ">
+	                    <div class="row_celltitles">
+	                        <a id="add_link" href="#"><fmt:message key="label.add"/></a></div>
+	                </div>
+	            </div>              
+	            <div id="grid_content">
+	            </div>            
+	        </div>
+        </div>      
+    </div>
+    <!-- Firewall ends here-->
+    
     <!-- Port Range start here-->
     <div id="tab_content_port_range" style="display:none">
     	<div id="tab_spinning_wheel" class="rightpanel_mainloader_panel" style="display: none;">
@@ -252,18 +336,18 @@ dictionary = {
 	            <div class="grid_rows even" id="create_port_range_row">
 	                <div class="grid_row_cell" style="width: 15%; ">
 	                    <input id="start_port" class="text" style="width: 70%;" type="text" />
-	                    <div id="start_port_errormsg" class="errormsg" style="display: none;">Error msg will appear here</div>
+	                    <div id="start_port_errormsg" class="errormsg" style="display: none;"></div>
 	                </div>
 	                <div class="grid_row_cell" style="width: 15%; ">
 	                    <input id="end_port" class="text" style="width: 70%;" type="text" />
-	                    <div id="end_port_errormsg" class="errormsg" style="display: none;">Error msg will appear here</div>
+	                    <div id="end_port_errormsg" class="errormsg" style="display: none;"></div>
 	                </div>
 	                <div class="grid_row_cell" style="width: 15%; ">  
 	                   <select class="select" id="protocol" style="width:70%;">	                  
 	                   </select>
 	                </div>	                
 	                <div class="grid_row_cell" style="width: 15%; ">   
-	                    <div class="row_celltitles" id="state"></div>
+	                    <div class="row_celltitles" id="state" style="padding:1px;"></div>
 	                </div>  
 	                <div class="grid_row_cell" style="width: 15%; ">
 	                    <div class="row_celltitles">
@@ -288,11 +372,7 @@ dictionary = {
         </div>        
         <div id="tab_container">
 	        <div class="grid_container" id="grid_container">
-	            <div class="grid_header">
-	                <div class="grid_header_cell" style="width: 25%; ">
-	                    <div class="grid_header_title">
-	                        <fmt:message key="label.cidr.list"/></div>
-	                </div>		            
+	            <div class="grid_header">	                          
 	                <div class="grid_header_cell" style="width: 15%; ">
 	                    <div class="grid_header_title">
 	                        <fmt:message key="label.public.port"/></div>
@@ -305,55 +385,51 @@ dictionary = {
 	                    <div class="grid_header_title">
 	                        <fmt:message key="label.protocol"/></div>
 	                </div>
-	                <div class="grid_header_cell" style="width: 15%;  border: none;">
+	                <div class="grid_header_cell" style="width: 30%;  border: none;">
 	                    <div class="grid_header_title">
 	                        <fmt:message key="label.instance"/></div>
 	                </div>
-	                <div class="grid_header_cell" style="width: 5%; ">
+	                <div class="grid_header_cell" style="width: 10%; ">
 	                    <div class="grid_header_title">
 	                        <fmt:message key="label.state"/></div>
 	                </div>
-	                <div class="grid_header_cell" style="width: 10%; ">
+	                <div class="grid_header_cell" style="width: 15%; ">
 	                    <div class="grid_header_title">
 	                        <fmt:message key="label.actions"/></div>
 	                </div>
 	            </div>
-	            <div class="grid_rows even" id="create_port_forwarding_row">
-	                <div class="grid_row_cell" style="width: 25%; ">  
-	                    <input id="cidr" class="text" type="text" />
-	                    <div id="cidr_errormsg" class="errormsg" style="display: none;">Error msg will appear here</div>
-	                </div>
+	            <div class="grid_rows even" id="create_port_forwarding_row">	               
 	                <div class="grid_row_cell" style="width: 15%; ">
 	                    <input id="public_port" class="text" style="width: 30%; " type="text" />
-	                    <div id="public_port_errormsg" class="errormsg" style="display: none;">Error msg will appear here</div>
+	                    <div id="public_port_errormsg" class="errormsg" style="display: none;"></div>
 	                    
 	                    <span style="float:left;padding-left:10px"> - </span>
 	                    
 	                    <input id="public_end_port" class="text" style="width: 30%; " type="text" />
-	                    <div id="public_end_port_errormsg" class="errormsg" style="display: none;">Error msg will appear here</div>	                    
+	                    <div id="public_end_port_errormsg" class="errormsg" style="display: none;"></div>	                    
 	                </div>
 	                <div class="grid_row_cell" style="width: 15%;">
                         <input id="private_port" class="text" style="width: 30%; " type="text" />
-	                    <div id="private_port_errormsg" class="errormsg" style="display: none;">Error msg will appear here</div>
+	                    <div id="private_port_errormsg" class="errormsg" style="display: none;"></div>
 	                    
 	                    <span style="float:left;padding-left:10px"> - </span>
 	                    
 	                    <input id="private_end_port" class="text" style="width: 30%; " type="text" />
-	                    <div id="private_end_port_errormsg" class="errormsg" style="display: none;">Error msg will appear here</div>	 
+	                    <div id="private_end_port_errormsg" class="errormsg" style="display: none;"></div>	 
 	                </div>
 	                <div class="grid_row_cell" style="width: 10%; ">  
 	                   <select class="select" id="protocol" style="width:70%;">	                    
 	                   </select>
 	                </div>
-	                <div class="grid_row_cell" style="width: 15%; ">                   
+	                <div class="grid_row_cell" style="width: 30%; ">                   
 	                    <select class="select" id="vm">
 	                    </select>
 	                    <div id="vm_errormsg" class="errormsg" style="display: none;"></div>	                    
 	                </div>
-	                <div class="grid_row_cell" style="width: 5%; ">   
+	                <div class="grid_row_cell" style="width: 10%; ">   
 	                    <div class="row_celltitles" id="state" style="padding:1px;"></div>
 	                </div>  
-	                <div class="grid_row_cell" style="width: 10%; ">
+	                <div class="grid_row_cell" style="width: 15%; ">
 	                    <div class="row_celltitles">
 	                        <a id="add_link" href="#"><fmt:message key="label.add"/></a></div>
 	                </div>
@@ -377,60 +453,56 @@ dictionary = {
         <div id="tab_container">
 	        <div class="grid_container">
 	            <div class="grid_header">	            
+	                          
 	                <div class="grid_header_cell" style="width: 25%; ">
-	                    <div class="grid_header_title">
-	                        <fmt:message key="label.cidr.list"/></div>
-	                </div>		            
-	                <div class="grid_header_cell" style="width: 14%; ">
 	                    <div class="grid_header_title">
 	                        <fmt:message key="label.name"/></div>
 	                </div>
-	                <div class="grid_header_cell" style="width: 12%; ">
+	                <div class="grid_header_cell" style="width: 15%; ">
 	                    <div class="grid_header_title">
 	                        <fmt:message key="label.public.port"/></div>
 	                </div>
-	                <div class="grid_header_cell" style="width: 12%; ">
+	                <div class="grid_header_cell" style="width: 15%; ">
 	                    <div class="grid_header_title">
 	                        <fmt:message key="label.private.port"/></div>
 	                </div>
-	                <div class="grid_header_cell" style="width: 12%; ">
+	                <div class="grid_header_cell" style="width: 15%; ">
 	                    <div class="grid_header_title">
 	                        <fmt:message key="label.algorithm"/></div>
 	                </div>	                
-	                <div class="grid_header_cell" style="width: 6%; ">
+	                <div class="grid_header_cell" style="width: 10%; ">
 	                    <div class="grid_header_title">
 	                        <fmt:message key="label.state"/></div>
 	                </div>	                
-	                <div class="grid_header_cell" style="width: 17%; ">
+	                <div class="grid_header_cell" style="width: 15%; ">
 	                    <div class="grid_header_title">
 	                        <fmt:message key="label.actions"/></div>
 	                </div>
 	            </div>
-	            <div class="grid_rows even" id="create_load_balancer_row">	            
-	                <div class="grid_row_cell" style="width: 25%; ">  
-	                    <input id="cidr" class="text" type="text" />
-	                    <div id="cidr_errormsg" class="errormsg" style="display: none;"></div>
-	                </div>	            
-	                <div class="grid_row_cell" style="width: 14%; ">
+	            <div class="grid_rows even" id="create_load_balancer_row">	
+	                <div class="grid_row_cell" style="width: 25%; ">
 	                    <input id="name" class="text" style="width: 70%; " type="text" />
 	                    <div id="name_errormsg" class="errormsg" style="display: none;"></div>
 	                </div>
-	                <div class="grid_row_cell" style="width: 12%;">
+	                <div class="grid_row_cell" style="width: 15%;">
 	                    <input id="public_port" class="text" style="width: 70%; " type="text" />
 	                    <div id="public_port_errormsg" class="errormsg" style="display: none;"></div>
 	                </div>
-	                <div class="grid_row_cell" style="width: 12%;">
+	                <div class="grid_row_cell" style="width: 15%;">
 	                    <input id="private_port" class="text" style="width: 70%; " type="text" />
 	                    <div id="private_port_errormsg" class="errormsg" style="display: none;"></div>
 	                </div>
-	                <div class="grid_row_cell" style="width: 12%;">
-	                    <select id="algorithm_select" class="select" style="width: 70%;">   	                      
+	                <div class="grid_row_cell" style="width: 15%;">
+	                    <select id="algorithm_select" class="select" style="width: 70%;">   
+	                        <option value='roundrobin'>roundrobin</option>
+			                <option value='leastconn'>leastconn</option>                            
+			                <option value='source'>source</option>    	                      
 	                    </select>
 	                </div>	                
-	                <div class="grid_row_cell" style="width: 6%;">	  
+	                <div class="grid_row_cell" style="width: 10%;">	  
                     	<div class="row_celltitles" style="padding:1px;"></div>         
 	                </div>	                
-	                <div class="grid_row_cell" style="width: 17%; ">
+	                <div class="grid_row_cell" style="width: 15%; ">
 	                    <div class="row_celltitles">
 	                        <a id="add_link" href="#"><fmt:message key="label.add"/></a></div>
 	                </div>
@@ -494,32 +566,76 @@ dictionary = {
                 <fmt:message key="label.acquire.new.ip"/>
             </div>
         </div>
+    </div>    
+    <div class="actionpanel_button_wrapper" id="add_load_balancer_and_ip_button" style="display:none;">
+        <div class="actionpanel_button">
+            <div class="actionpanel_button_icons">
+                <img src="images/addvm_actionicon.png" /></div>
+            <div class="actionpanel_button_links">
+                <fmt:message key="label.add.load.balancer"/>
+            </div>
+        </div>
     </div>
 </div>
 <!--  top buttons (end) -->
 
+<!-- Firewall template (begin) -->
+<div class="grid_rows odd" id="firewall_template" style="display: none">    
+    <div id="row_container">        
+        <div class="grid_row_cell" style="padding:1px; width: 30%; ">
+           <div class="row_celltitles" id="cidr"></div>
+        </div>   
+        <div class="grid_row_cell" style="padding:1px; width: 15%; ">
+            <div class="row_celltitles" id="protocol"></div>
+        </div>       
+        <div class="grid_row_cell" style="padding:1px; width: 10%; ">
+            <div class="row_celltitles" id="start_port"></div>
+        </div>
+        <div class="grid_row_cell" style="padding:1px; width: 10%; ">
+            <div class="row_celltitles" id="end_port"></div>
+        </div>        
+        <div class="grid_row_cell" style="padding:1px; width: 10%; ">
+            <div class="row_celltitles" id="ICMP_type"></div>
+        </div>
+         <div class="grid_row_cell" style="padding:1px; width: 10%; ">
+            <div class="row_celltitles" id="ICMP_code"></div>
+        </div>
+        <div class="grid_row_cell" style="padding:1px; width: 10%; ">
+            <div class="row_celltitles">
+                <a id="delete_link" href="#" style="float:left;"><fmt:message key="label.delete"/> </a>                            
+            </div>
+        </div>
+        <div class="gridrow_loaderbox" style="display: none;" id="spinning_wheel">
+            <div class="gridrow_loader">
+            </div>
+            <p id="description">
+                <fmt:message key="label.waiting"/>  &hellip;
+            </p>
+        </div>
+    </div>    
+</div>
+<!-- Firewall template (end) -->
+
 <!-- Load Balancer Template (begin) -->
 <div class="grid_rows odd" id="load_balancer_template" style="display:none">
     <div id="row_container">        
+              
         <div class="grid_row_cell" style="width: 25%; ">
-            <div class="row_celltitles" id="cidr" style="padding:1px;"></div>
-        </div>        
-        <div class="grid_row_cell" style="width: 14%; ">
             <div class="row_celltitles" id="name"></div>
         </div>
-        <div class="grid_row_cell" style="width: 12%; ">
+        <div class="grid_row_cell" style="width: 15%; ">
             <div class="row_celltitles" id="public_port"></div>
         </div>
-        <div class="grid_row_cell" style="width: 12%; ">
+        <div class="grid_row_cell" style="width: 15%; ">
             <div class="row_celltitles" id="private_port"></div>
         </div>
-        <div class="grid_row_cell" style="width: 12%; ">
+        <div class="grid_row_cell" style="width: 15%; ">
             <div class="row_celltitles" id="algorithm"></div>
         </div>        
-        <div class="grid_row_cell" style="width: 6%; ">
+        <div class="grid_row_cell" style="width: 10%; ">
             <div class="row_celltitles" id="state" style="padding:1px;"></div>
         </div>  
-        <div class="grid_row_cell" style="width: 17%; ">
+        <div class="grid_row_cell" style="width: 15%; ">
             <div class="row_celltitles">
                 <a id="manage_link" href="#" style="float:left;"><fmt:message key="label.manage"/></a>
                 <a id="edit_link" href="#" style="float:left; margin-left:15px;"><fmt:message key="label.edit"/></a>
@@ -548,8 +664,11 @@ dictionary = {
         <div class="grid_row_cell" style="width: 12%; ">
             <div class="row_celltitles" id="private_port"></div>
         </div>
-        <div class="grid_row_cell" style="width: 12%; ">
-            <select id="algorithm_select" class="select" style="width: 70%;">                 
+        <div class="grid_row_cell" style="width: 15%; ">
+            <select id="algorithm_select" class="select" style="width: 70%;">    
+                <option value='roundrobin'>roundrobin</option>
+                <option value='leastconn'>leastconn</option>                            
+                <option value='source'>source</option>            
             </select>
         </div>        
         <div class="grid_row_cell" style="width: 6%; ">
@@ -658,10 +777,7 @@ dictionary = {
 
 <!-- Port Forwarding template (begin) -->
 <div class="grid_rows odd" id="port_forwarding_template" style="display: none">    
-    <div id="row_container">
-        <div class="grid_row_cell" style="width: 25%; ">
-            <div class="row_celltitles" id="cidr" style="padding:1px;"></div>
-        </div>
+    <div id="row_container">       
         <div class="grid_row_cell" style="width: 15%; ">
             <div class="row_celltitles" id="public_port"></div>
         </div>
@@ -671,13 +787,13 @@ dictionary = {
         <div class="grid_row_cell" style="width: 10%; ">
             <div class="row_celltitles" id="protocol"></div>
         </div>
-        <div class="grid_row_cell" style="width: 15%; ">
+        <div class="grid_row_cell" style="width: 30%; ">
             <div class="row_celltitles" id="vm_name"></div>
         </div>   
-        <div class="grid_row_cell" style="width: 5%; ">
+        <div class="grid_row_cell" style="width: 10%; ">
             <div class="row_celltitles" id="state" style="padding:1px;"></div>
         </div>        
-        <div class="grid_row_cell" style="width: 10%; ">
+        <div class="grid_row_cell" style="width: 15%; ">
             <div class="row_celltitles">
                 <a id="delete_link" href="#" style="float:left;"><fmt:message key="label.delete"/> </a>                                
             </div>
@@ -782,6 +898,45 @@ dictionary = {
     </div>
 </div>
 
+<div id="dialog_add_load_balancer_and_ip" title='<fmt:message key="label.add.load.balancer"/>' style="display: none">   
+    <div class="dialog_formcontent">
+        <form action="#" method="post" id="form1">
+        <ol>
+            <li>
+                <label>
+                    <fmt:message key="label.zone"/>:</label>
+                <select class="select" name="acquire_zone" id="acquire_zone">
+                    <option value="default"><fmt:message key="label.waiting"/>....</option>
+                </select>
+            </li>            
+            <li>
+				<label><fmt:message key="label.name"/>:</label>
+				<input class="text" type="text" id="name"/>
+				<div id="name_errormsg" class="dialog_formcontent_errormsg" style="display:none;"></div>
+			</li>
+			<li>
+				<label><fmt:message key="label.public.port"/>:</label>
+				<input class="text" type="text" id="public_port"/>
+				<div id="public_port_errormsg" class="dialog_formcontent_errormsg" style="display:none;"></div>
+			</li>
+			<li>
+				<label><fmt:message key="label.private.port"/>:</label>
+				<input class="text" type="text" id="private_port"/>
+				<div id="private_port_errormsg" class="dialog_formcontent_errormsg" style="display:none;"></div>
+			</li>
+			<li>
+                <label><fmt:message key="label.algorithm"/>:</label>
+                <select class="select" id="algorithm_select">
+                    <option value='roundrobin'>roundrobin</option>
+                    <option value='leastconn'>leastconn</option>                            
+                    <option value='source'>source</option>
+                </select>
+            </li>           
+        </ol>
+        </form>
+    </div>
+</div>
+
 <!-- Create User for VPN (begin) -->
 <div id="dialog_add_vpnuser" title="Add VPN User" style="display:none">	
 	<p> 
diff --git a/ui/jsp/serviceoffering.jsp b/ui/jsp/serviceoffering.jsp
index 96e4e714322..763e4c6cbdd 100644
--- a/ui/jsp/serviceoffering.jsp
+++ b/ui/jsp/serviceoffering.jsp
@@ -125,6 +125,16 @@ dictionary = {
 	                </div>
 	            </div>
 	            <div class="grid_rows odd">
+	                <div class="grid_row_cell" style="width: 20%;">
+	                    <div class="row_celltitles">
+	                        <fmt:message key="network.rate"/>:</div>
+	                </div>
+	                <div class="grid_row_cell" style="width: 79%;">
+	                    <div class="row_celltitles" id="network_rate">
+	                    </div>
+	                </div>
+	            </div>
+	            <div class="grid_rows even">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
 	                        <fmt:message key="label.offer.ha"/>:</div>
@@ -135,7 +145,7 @@ dictionary = {
 	                </div>
 	            </div>
 	            
-	            <div class="grid_rows even">
+	            <div class="grid_rows odd">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
 	                        <fmt:message key="label.CPU.cap"/>:</div>
@@ -146,7 +156,7 @@ dictionary = {
 	                </div>
 	            </div>
 	                       
-	            <div class="grid_rows odd">
+	            <div class="grid_rows even">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
 	                        <fmt:message key="label.storage.tags"/>:</div>
@@ -157,7 +167,7 @@ dictionary = {
 	                </div>
 	            </div>
 	            	            
-	            <div class="grid_rows even">
+	            <div class="grid_rows odd">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
 	                        <fmt:message key="label.host.tags"/>:</div>
@@ -168,7 +178,7 @@ dictionary = {
 	                </div>
 	            </div>	                     
 	            
-	            <div class="grid_rows odd">
+	            <div class="grid_rows even">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
 	                        <fmt:message key="label.domain"/>:</div>
@@ -181,7 +191,7 @@ dictionary = {
 	                </div>
 	            </div>
 	            
-	            <div class="grid_rows even">
+	            <div class="grid_rows odd">
 	                <div class="grid_row_cell" style="width: 20%;">
 	                    <div class="row_celltitles">
 	                        <fmt:message key="label.created"/>:</div>
@@ -221,12 +231,12 @@ dictionary = {
 		<form action="#" method="post" id="form_acquire">
 			<ol>
 				<li>
-					<label for="user_name"><fmt:message key="label.name"/>:</label>
+					<label><fmt:message key="label.name"/>:</label>
 					<input class="text" type="text" name="add_service_name" id="add_service_name"/>
 					<div id="add_service_name_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
 				</li>
 				<li>
-					<label for="user_name"><fmt:message key="label.display.text"/>:</label>
+					<label><fmt:message key="label.display.text"/>:</label>
 					<input class="text" type="text" name="add_service_display" id="add_service_display"/>
 					<div id="add_service_display_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
 				</li>
@@ -238,20 +248,25 @@ dictionary = {
 					</select>
 				</li>		
 				<li>
-					<label for="user_name"><fmt:message key="label.num.cpu.cores"/>:</label>
+					<label><fmt:message key="label.num.cpu.cores"/>:</label>
 					<input class="text" type="text" name="add_service_cpucore" id="add_service_cpucore"/>
 					<div id="add_service_cpucore_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
 				</li>
 				<li>
-					<label for="user_name"><fmt:message key="label.cpu.mhz"/>:</label>
+					<label><fmt:message key="label.cpu.mhz"/>:</label>
 					<input class="text" type="text" name="add_service_cpu" id="add_service_cpu"/>
 					<div id="add_service_cpu_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
 				</li>
 				<li>
-					<label for="user_name"><fmt:message key="label.memory.mb"/>:</label>
+					<label><fmt:message key="label.memory.mb"/>:</label>
 					<input class="text" type="text" name="add_service_memory" id="add_service_memory"/>
 					<div id="add_service_memory_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
-				</li>				
+				</li>					
+				<li>
+					<label><fmt:message key="network.rate"/>:</label>
+					<input class="text" type="text" id="network_rate"/>
+					<div id="network_rate_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
+				</li>	
 				<li id="add_service_offerha_container">
 					<label><fmt:message key="label.offer.ha"/>:</label>
 					<select class="select" id="add_service_offerha">						
diff --git a/ui/scripts/cloud.core.account.js b/ui/scripts/cloud.core.account.js
index a0046fc72ef..e0f1a55d41d 100644
--- a/ui/scripts/cloud.core.account.js
+++ b/ui/scripts/cloud.core.account.js
@@ -384,7 +384,7 @@ function accountJsonToDetailsTab() {
         accountClearDetailsTab();
         return;
     }
-   
+
     $.ajax({
         data: createURL("command=listAccounts&id="+jsonObj.id),
         dataType: "json",
@@ -614,14 +614,12 @@ var accountActionMap = {
         asyncJobResponse: "deleteaccountresponse",
         dialogBeforeActionFn : doDeleteAccount,
         inProcessText: "label.action.delete.account.processing",
-        afterActionSeccessFn: function(json, $midmenuItem1, id) {    
-            $midmenuItem1.slideUp("slow", function() {                
-                $(this).remove();  
-                if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) {
-                    clearRightPanel();
-                    accountClearRightPanel();
-                }                
-            });
+        afterActionSeccessFn: function(json, $midmenuItem1, id) {  
+    	    $midmenuItem1.remove();
+            if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) {
+                clearRightPanel();
+                accountClearRightPanel();
+            }   
         }
     }          
 }; 
diff --git a/ui/scripts/cloud.core.cluster.js b/ui/scripts/cloud.core.cluster.js
index fe103f38e7d..a11f36617f9 100644
--- a/ui/scripts/cloud.core.cluster.js
+++ b/ui/scripts/cloud.core.cluster.js
@@ -94,10 +94,12 @@ function clusterBuildActionMenu(jsonObj) {
     else if(jsonObj.allocationstate == "Enabled")  
         buildActionLinkForTab("label.action.disable.cluster", clusterActionMap, $actionMenu, $midmenuItem1, $thisTab); 
     
+    /*
     if(jsonObj.managedstate == "Managed")
     	buildActionLinkForTab("label.action.unmanage.cluster", clusterActionMap, $actionMenu, $midmenuItem1, $thisTab); 
     else //PrepareUnmanaged , PrepareUnmanagedError, Unmanaged 
     	buildActionLinkForTab("label.action.manage.cluster", clusterActionMap, $actionMenu, $midmenuItem1, $thisTab); 
+    */
     
     buildActionLinkForTab("label.action.delete.cluster", clusterActionMap, $actionMenu, $midmenuItem1, $thisTab);  	
 }
@@ -171,13 +173,11 @@ var clusterActionMap = {
         dialogBeforeActionFn : doDeleteCluster,   
         inProcessText: "label.action.delete.cluster.processing",
         afterActionSeccessFn: function(json, $midmenuItem1, id) {     
-            $midmenuItem1.slideUp("slow", function() {
-                $(this).remove();                
-                if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) {
-                    clearRightPanel();
-                    clusterClearRightPanel();
-                }                
-            });            
+            $midmenuItem1.remove();
+            if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) {
+                clearRightPanel();
+                clusterClearRightPanel();
+            }     
         }
     }
 }
diff --git a/ui/scripts/cloud.core.diskoffering.js b/ui/scripts/cloud.core.diskoffering.js
index 73d1ff1eb16..b00b00e09de 100644
--- a/ui/scripts/cloud.core.diskoffering.js
+++ b/ui/scripts/cloud.core.diskoffering.js
@@ -376,13 +376,11 @@ var diskOfferingActionMap = {
         dialogBeforeActionFn : doDeleteDiskOffering,              
         inProcessText: "label.action.delete.disk.offering.processing",
         afterActionSeccessFn: function(json, $midmenuItem1, id) {   
-            $midmenuItem1.slideUp("slow", function() {
-                $(this).remove();   
-                if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) {
-                    clearRightPanel();
-                    diskOfferingClearRightPanel();
-                }                
-            });         
+    		$midmenuItem1.remove();   
+            if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) {
+                clearRightPanel();
+                diskOfferingClearRightPanel();
+            }      
         }
     }    
 }  
\ No newline at end of file
diff --git a/ui/scripts/cloud.core.domain.js b/ui/scripts/cloud.core.domain.js
index c2518cddd71..4478ec1bf41 100644
--- a/ui/scripts/cloud.core.domain.js
+++ b/ui/scripts/cloud.core.domain.js
@@ -717,13 +717,11 @@ var domainActionMap = {
         asyncJobResponse: "deletedomainresponse",          
         inProcessText: "label.action.delete.domain.processing",
         afterActionSeccessFn: function(json, $midmenuItem1, id) {        
-            $midmenuItem1.slideUp(function() {                
-                $(this).remove();   
-                if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) {
-                    clearRightPanel();
-                    domainJsonClearRightPanel();
-                }                
-            });                
+    		$midmenuItem1.remove();   	
+            if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) {
+                clearRightPanel();
+                domainJsonClearRightPanel();
+            }            
         }
     }    
 } 
\ No newline at end of file
diff --git a/ui/scripts/cloud.core.host.js b/ui/scripts/cloud.core.host.js
index 9dbea475c20..14aa8ecc215 100644
--- a/ui/scripts/cloud.core.host.js
+++ b/ui/scripts/cloud.core.host.js
@@ -127,8 +127,9 @@ function hostJsonToDetailsTab() {
                 
     $thisTab.find("#id").text(fromdb(jsonObj.id));
     $thisTab.find("#grid_header_title").text(fromdb(jsonObj.name));
-    $thisTab.find("#name").text(fromdb(jsonObj.name));
-        
+    $thisTab.find("#name").text(fromdb(jsonObj.name));
+    $thisTab.find("#hosttags").text(fromdb(jsonObj.hosttags));    
+    
     setHostStateInRightPanel(fromdb(jsonObj.state), $thisTab.find("#state"));
     
     
@@ -585,13 +586,11 @@ var hostActionMap = {
         dialogBeforeActionFn: doRemoveHost,
         inProcessText: "label.action.remove.host.processing",
         afterActionSeccessFn: function(json, $midmenuItem1, id) {    
-            $midmenuItem1.slideUp("slow", function() {
-                $(this).remove();
-                if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) {
-                    clearRightPanel();
-                    hostClearRightPanel();
-                }               
-            });         
+            $midmenuItem1.remove();               
+            if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) {
+                clearRightPanel();
+                hostClearRightPanel();
+            }                         
         }
     },    
     "label.action.update.OS.preference": {              
diff --git a/ui/scripts/cloud.core.init.js b/ui/scripts/cloud.core.init.js
index b40a5285e05..01b751fe53d 100644
--- a/ui/scripts/cloud.core.init.js
+++ b/ui/scripts/cloud.core.init.js
@@ -208,9 +208,13 @@ $(document).ready(function() {
 		bindAndListMidMenuItems($("#leftmenu_event"), "listEvents", eventGetSearchParams, "listeventsresponse", "event", "jsp/event.jsp", afterLoadEventJSP, eventToMidmenu, eventToRightPanel, getMidmenuId, false);
 		bindAndListMidMenuItems($("#leftmenu_volume"), "listVolumes", volumeGetSearchParams, "listvolumesresponse", "volume", "jsp/volume.jsp", afterLoadVolumeJSP, volumeToMidmenu, volumeToRightPanel, getMidmenuId, false);
 		bindAndListMidMenuItems($("#leftmenu_snapshot"), "listSnapshots", snapshotGetSearchParams, "listsnapshotsresponse", "snapshot", "jsp/snapshot.jsp", afterLoadSnapshotJSP, snapshotToMidmenu, snapshotToRightPanel, getMidmenuId, false);
-		
-		//bindAndListMidMenuItems($("#leftmenu_ip"), "listPublicIpAddresses&forvirtualnetwork=true", ipGetSearchParams, "listpublicipaddressesresponse", "publicipaddress", "jsp/ipaddress.jsp", afterLoadIpJSP, ipToMidmenu, ipToRightPanel, ipGetMidmenuId, false);
-		bindAndListMidMenuItems($("#leftmenu_ip"), "listPublicIpAddresses", ipGetSearchParams, "listpublicipaddressesresponse", "publicipaddress", "jsp/ipaddress.jsp", afterLoadIpJSP, ipToMidmenu, ipToRightPanel, ipGetMidmenuId, false); //remove "&forvirtualnetwork=true" for advanced zone whose security group is enabled
+				
+		if(g_supportELB == "guest")  //ips are allocated on guest network
+			bindAndListMidMenuItems($("#leftmenu_ip"), "listPublicIpAddresses&forvirtualnetwork=false&forloadbalancing=true", ipGetSearchParams, "listpublicipaddressesresponse", "publicipaddress", "jsp/ipaddress.jsp", afterLoadIpJSP, ipToMidmenu, ipToRightPanel, ipGetMidmenuId, false);
+		else if(g_supportELB == "public")  //ips are allocated on public network
+			bindAndListMidMenuItems($("#leftmenu_ip"), "listPublicIpAddresses&forvirtualnetwork=true&forloadbalancing=true", ipGetSearchParams, "listpublicipaddressesresponse", "publicipaddress", "jsp/ipaddress.jsp", afterLoadIpJSP, ipToMidmenu, ipToRightPanel, ipGetMidmenuId, false);
+		else			
+		    bindAndListMidMenuItems($("#leftmenu_ip"), "listPublicIpAddresses", ipGetSearchParams, "listpublicipaddressesresponse", "publicipaddress", "jsp/ipaddress.jsp", afterLoadIpJSP, ipToMidmenu, ipToRightPanel, ipGetMidmenuId, false); //remove "&forvirtualnetwork=true" for advanced zone whose security group is enabled
 		
 		bindAndListMidMenuItems($("#leftmenu_security_group"), "listSecurityGroups", securityGroupGetSearchParams, "listsecuritygroupsresponse", "securitygroup", "jsp/securitygroup.jsp", afterLoadSecurityGroupJSP, securityGroupToMidmenu, securityGroupToRightPanel, getMidmenuId, false);
 					 		  
@@ -591,6 +595,8 @@ $(document).ready(function() {
 		g_domainid = null;	
 		g_timezoneoffset = null;
 		g_timezone = null;
+		g_supportELB = null;
+		g_firewallRuleUiEnabled = null;
 		
 		$.cookie('JSESSIONID', null);
 		$.cookie('sessionKey', null);
@@ -601,6 +607,8 @@ $(document).ready(function() {
 		$.cookie('networktype', null); 
 		$.cookie('timezoneoffset', null);
 		$.cookie('timezone', null);
+		$.cookie('supportELB', null);
+		$.cookie('firewallRuleUiEnabled', null);
 		
 		$("body").stopTime();
 		
@@ -687,20 +695,30 @@ $(document).ready(function() {
 				$.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});  				
+								
 				$.ajax({
 					data: createURL("command=listCapabilities"),
 					dataType: "json",
 					async: false,
-					success: function(json) {
+					success: function(json) {	
+					    /* g_supportELB: "guest"   � ips are allocated on guest network (so use 'forvirtualnetwork' = false)
+					     * g_supportELB: "public"  - ips are allocated on public network (so use 'forvirtualnetwork' = true)
+					     * g_supportELB: "false"   � no ELB support
+					     */
+					    g_supportELB = json.listcapabilitiesresponse.capability.supportELB.toString(); //convert boolean to string if it's boolean				    
+					    $.cookie('supportELB', g_supportELB, { expires: 1}); 
+					    					    
+					    g_firewallRuleUiEnabled = json.listcapabilitiesresponse.capability.firewallRuleUiEnabled.toString(); //convert boolean to string if it's boolean						    
+					    $.cookie('firewallRuleUiEnabled', g_firewallRuleUiEnabled, { expires: 1}); 
+					    			    
 						if (json.listcapabilitiesresponse.capability.userpublictemplateenabled != null) {
-							g_userPublicTemplateEnabled = ""+json.listcapabilitiesresponse.capability.userpublictemplateenabled;
+							g_userPublicTemplateEnabled = json.listcapabilitiesresponse.capability.userpublictemplateenabled.toString(); //convert boolean to string if it's boolean
 							$.cookie('userpublictemplateenabled', g_userPublicTemplateEnabled, { expires: 1});
 						}
 						
 						if (json.listcapabilitiesresponse.capability.securitygroupsenabled != null) {
-							g_directAttachSecurityGroupsEnabled = ""+json.listcapabilitiesresponse.capability.securitygroupsenabled;
+							g_directAttachSecurityGroupsEnabled = json.listcapabilitiesresponse.capability.securitygroupsenabled.toString(); //convert boolean to string if it's boolean
 							$.cookie('directattachsecuritygroupsenabled', g_directAttachSecurityGroupsEnabled, { expires: 1});
 						}
 						
@@ -765,17 +783,17 @@ $(document).ready(function() {
 		g_domainid = $.cookie("domainid");
 		g_timezone = $.cookie("timezone");
 		g_directAttachSecurityGroupsEnabled = $.cookie("directattachsecuritygroupsenabled");
-		g_userPublicTemplateEnabled = $.cookie("userpublictemplateenabled");
-		
+		g_userPublicTemplateEnabled = $.cookie("userpublictemplateenabled");		
+				
 		if($.cookie("timezoneoffset") != null)
 			g_timezoneoffset = isNaN($.cookie("timezoneoffset"))?null: parseFloat($.cookie("timezoneoffset"));
 		else
 			g_timezoneoffset = null;
 			
-		if (!g_directAttachSecurityGroupsEnabled || g_directAttachSecurityGroupsEnabled.length == 0) 		
+		if (g_directAttachSecurityGroupsEnabled == null || g_directAttachSecurityGroupsEnabled.length == 0) 		
 			g_directAttachSecurityGroupsEnabled = "false";	
 			
-		if (!g_userPublicTemplateEnabled || g_userPublicTemplateEnabled.length == 0) 		
+		if (g_userPublicTemplateEnabled == null || g_userPublicTemplateEnabled.length == 0) 		
 			g_userPublicTemplateEnabled = "true";
 	} else {
 		g_mySession = $.cookie('JSESSIONID');
@@ -787,21 +805,37 @@ $(document).ready(function() {
 		g_timezone = g_loginResponse.timezone;								
 		g_timezoneoffset = g_loginResponse.timezoneoffset;
 	}
-		
+	
+	if(g_supportELB == null)
+		g_supportELB = $.cookie("supportELB");
+		
+	if(g_firewallRuleUiEnabled == null)
+		g_firewallRuleUiEnabled = $.cookie("firewallRuleUiEnabled");
+	
 	$.ajax({
 	    data: createURL("command=listCapabilities"),
 		dataType: "json",
 		async: false,
-		success: function(json) {
-			if (json.listcapabilitiesresponse.capability.userpublictemplateenabled != null) {
-				g_userPublicTemplateEnabled = ""+json.listcapabilitiesresponse.capability.userpublictemplateenabled;
-				$.cookie('userpublictemplateenabled', g_userPublicTemplateEnabled, { expires: 1});
-			}
-			
-			if (json.listcapabilitiesresponse.capability.securitygroupsenabled != null) {
-				g_directAttachSecurityGroupsEnabled = ""+json.listcapabilitiesresponse.capability.securitygroupsenabled;
-				$.cookie('directattachsecuritygroupsenabled', g_directAttachSecurityGroupsEnabled, { expires: 1});
-			}
+		success: function(json) {		 
+			/* g_supportELB: "guest"   � ips are allocated on guest network (so use 'forvirtualnetwork' = false)
+		     * g_supportELB: "public"  - ips are allocated on public network (so use 'forvirtualnetwork' = true)
+		     * g_supportELB: "false"   � no ELB support
+		     */
+		    g_supportELB = json.listcapabilitiesresponse.capability.supportELB.toString(); //convert boolean to string if it's boolean				    
+		    $.cookie('supportELB', g_supportELB, { expires: 1}); 
+		    					    
+		    g_firewallRuleUiEnabled = json.listcapabilitiesresponse.capability.firewallRuleUiEnabled.toString(); //convert boolean to string if it's boolean						    
+		    $.cookie('firewallRuleUiEnabled', g_firewallRuleUiEnabled, { expires: 1}); 
+		    			    
+			if (json.listcapabilitiesresponse.capability.userpublictemplateenabled != null) {
+				g_userPublicTemplateEnabled = json.listcapabilitiesresponse.capability.userpublictemplateenabled.toString(); //convert boolean to string if it's boolean
+				$.cookie('userpublictemplateenabled', g_userPublicTemplateEnabled, { expires: 1});
+			}
+			
+			if (json.listcapabilitiesresponse.capability.securitygroupsenabled != null) {
+				g_directAttachSecurityGroupsEnabled = json.listcapabilitiesresponse.capability.securitygroupsenabled.toString(); //convert boolean to string if it's boolean
+				$.cookie('directattachsecuritygroupsenabled', g_directAttachSecurityGroupsEnabled, { expires: 1});
+			}				    		
 						
 			buildSecondLevelNavigation();
 			$("#main_username").text(g_username);
diff --git a/ui/scripts/cloud.core.instance.js b/ui/scripts/cloud.core.instance.js
index 367d8824219..ee3d71358c6 100755
--- a/ui/scripts/cloud.core.instance.js
+++ b/ui/scripts/cloud.core.instance.js
@@ -1960,7 +1960,10 @@ function vmBuildActionMenu(jsonObj, $thisTab, $midmenuItem1) {
 		buildActionLinkForTab("label.action.stop.instance", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
 		buildActionLinkForTab("label.action.reboot.instance", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
 		buildActionLinkForTab("label.action.destroy.instance", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
-		if (isAdmin() && (jsonObj.rootdevicetype == 'NetworkFilesystem' || jsonObj.rootdevicetype == 'IscsiLUN' || jsonObj.rootdevicetype == 'PreSetup') && jsonObj.hypervisor == 'XenServer') {
+		if (isAdmin() 
+			&& (jsonObj.rootdevicetype == 'NetworkFilesystem' || jsonObj.rootdevicetype == 'IscsiLUN' || jsonObj.rootdevicetype == 'PreSetup')
+			&& (jsonObj.hypervisor == 'XenServer' || jsonObj.hypervisor == 'VMware')) 
+		{
 			buildActionLinkForTab("label.action.migrate.instance", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
 		}
 		
@@ -2202,33 +2205,21 @@ function vmJsonToStatisticsTab() {
 	}
 
     var $thisTab = $("#right_panel_content #tab_content_statistics");  	
-	
-	
-	/*
-	var $barChartContainer = $thisTab.find("#cpu_barchart");
-		 
-	var cpuNumber = ((jsonObj.cpunumber==null)? "":jsonObj.cpunumber.toString());
-	$barChartContainer.find("#cpunumber").text(cpuNumber);
-	
-	var cpuSpeed = ((jsonObj.cpuspeed==null)? "":convertHz(jsonObj.cpuspeed)) ;
-	$barChartContainer.find("#cpuspeed").text(cpuSpeed);
-	
-	$barChartContainer.find("#bar_chart").removeClass().addClass("db_barbox").css("width", "0%");    
-	$barChartContainer.find("#percentused").text("");   
-	if(jsonObj.cpuused!=null)
-		drawBarChart($barChartContainer, jsonObj.cpuused);		
-	*/
-    
+	    
     $thisTab.find("#cpunumber").text(fromdb(jsonObj.cpunumber));
     $thisTab.find("#cpuspeed").text(convertHz(jsonObj.cpuspeed));
     
     $thisTab.find("#percentused").text(jsonObj.cpuused); 
-    
-	var networkKbsRead = ((jsonObj.networkkbsread==null)? "":convertBytes(jsonObj.networkkbsread * 1024));
-	$thisTab.find("#networkkbsread").text(networkKbsRead);
-	
-	var networkKbsWrite = ((jsonObj.networkkbswrite==null)? "":convertBytes(jsonObj.networkkbswrite * 1024));
-	$thisTab.find("#networkkbswrite").text(networkKbsWrite);	
+    	
+	if(jsonObj.networkkbsread == null || jsonObj.networkkbsread == 0)
+		$thisTab.find("#networkkbsread").text("N/A");
+	else
+	    $thisTab.find("#networkkbsread").text(convertBytes(jsonObj.networkkbsread * 1024));
+		
+	if(jsonObj.networkkbswrite == null || jsonObj.networkkbswrite == 0)
+		$thisTab.find("#networkkbswrite").text("N/A");
+	else	
+	    $thisTab.find("#networkkbswrite").text(convertBytes(jsonObj.networkkbswrite * 1024));	
 }
 
 function vmJsonClearStatisticsTab() {       
diff --git a/ui/scripts/cloud.core.ipaddress.js b/ui/scripts/cloud.core.ipaddress.js
index 65f7bb8855a..17547a25dc6 100644
--- a/ui/scripts/cloud.core.ipaddress.js
+++ b/ui/scripts/cloud.core.ipaddress.js
@@ -1,21 +1,21 @@
- /**
- *  Copyright (C) 2010 Cloud.com, Inc.  All rights reserved.
- * 
- * This software is licensed under the GNU General Public License v3 or later.
- * 
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- */
-
+ /**
+ *  Copyright (C) 2010 Cloud.com, Inc.  All rights reserved.
+ * 
+ * This software is licensed under the GNU General Public License v3 or later.
+ * 
+ * It is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
 function ipGetSearchParams() {
     var moreCriteria = [];	
 
@@ -63,344 +63,631 @@ function ipGetSearchParams() {
 	} 	
 	
 	return moreCriteria.join("");          
-}
-
-function afterLoadIpJSP() {
-    //***** switch between different tabs (begin) ********************************************************************
-    var tabArray = [$("#tab_details"), $("#tab_port_range"), $("#tab_port_forwarding"), $("#tab_load_balancer"), $("#tab_vpn")];
-    var tabContentArray = [$("#tab_content_details"), $("#tab_content_port_range"), $("#tab_content_port_forwarding"), $("#tab_content_load_balancer"), $("#tab_content_vpn")];
-    var afterSwitchFnArray = [ipJsonToDetailsTab, ipJsonToPortRangeTab, ipJsonToPortForwardingTab, ipJsonToLoadBalancerTab, ipJsonToVPNTab];
+}
+
+function afterLoadIpJSP() {
+    // switch between different tabs 
+    var tabArray = [$("#tab_details"), $("#tab_firewall"), $("#tab_port_range"), $("#tab_port_forwarding"), $("#tab_load_balancer"), $("#tab_vpn")];
+    var tabContentArray = [$("#tab_content_details"), $("#tab_content_firewall"), $("#tab_content_port_range"), $("#tab_content_port_forwarding"), $("#tab_content_load_balancer"), $("#tab_content_vpn")];
+    var afterSwitchFnArray = [ipJsonToDetailsTab, ipJsonToFirewallTab, ipJsonToPortRangeTab, ipJsonToPortForwardingTab, ipJsonToLoadBalancerTab, ipJsonToVPNTab];
     switchBetweenDifferentTabs(tabArray, tabContentArray, afterSwitchFnArray);       
-    //***** switch between different tabs (end) **********************************************************************
-        
-    //dialogs
-    initDialog("dialog_acquire_public_ip", 325);
-	initDialog("dialog_enable_vpn");
-	initDialog("dialog_disable_vpn");
-	initDialog("dialog_add_vpnuser");
-	initDialog("dialog_confirmation_remove_vpnuser");
-	initDialog("dialog_enable_static_NAT");
-    
-    //*** Acquire New IP (begin) ***
-	$.ajax({
-	    data: createURL("command=listZones&available=true"),
-		dataType: "json",
-		success: function(json) {
-			var zones = json.listzonesresponse.zone;				
-			var zoneSelect = $("#dialog_acquire_public_ip #acquire_zone").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>"); 
-			    }
-		    }
-		}
-	});
-	    
-    $("#acquire_new_ip_button").unbind("click").bind("click", function(event) {  
-		var submenuContent = $("#submenu_content_network");
-		$("#dialog_acquire_public_ip").dialog('option', 'buttons', {				
-			"Acquire": function() { 
-				var thisDialog = $(this);	
-				thisDialog.dialog("close");
-						
-				var zoneid = thisDialog.find("#acquire_zone").val();				
+      
+    //****** Basic Zone, support Elastic Load Balancer (begin) *****************************************************************************************
+    if(g_supportELB == "guest" || g_supportELB == "public") {
+		$("#tab_details,#tab_firewall,#tab_port_range,#tab_port_forwarding,#tab_load_balancer,#tab_vpn").hide();	
 				
-				var $midmenuItem1 = beforeAddingMidMenuItem() ;	
+		$("#tab_content_details").hide();
 				
-				$.ajax({
-				    data: createURL("command=associateIpAddress&zoneid="+zoneid),
-				    dataType: "json",
-				    success: function(json) {						        
-				        var jobId = json.associateipaddressresponse.jobid;				        
-				        var timerKey = "associateIpJob_"+jobId;
-							    
-				        $("body").everyTime(2000, timerKey, function() {
-						    $.ajax({
-							    data: createURL("command=queryAsyncJobResult&jobId="+jobId),
-							    dataType: "json",
-							    success: function(json) {										       						   
-								    var result = json.queryasyncjobresultresponse;
-								    if (result.jobstatus == 0) {
-									    return; //Job has not completed
-								    } else {											    
-									    $("body").stopTime(timerKey);
-									    if (result.jobstatus == 1) {
-										    // Succeeded										    							   
-										    ipToMidmenu(result.jobresult.ipaddress, $midmenuItem1);
-						                    bindClickToMidMenu($midmenuItem1, ipToRightPanel, ipGetMidmenuId);  
-						                    afterAddingMidMenuItem($midmenuItem1, true);	                            
-									    } else if (result.jobstatus == 2) {
-									        afterAddingMidMenuItem($midmenuItem1, false, fromdb(result.jobresult.errortext));					        							        								   				    
-									    }
-								    }
-							    },
-							    error: function(XMLHttpResponse) {
-								    $("body").stopTime(timerKey);
-									handleError(XMLHttpResponse, function() {
-										afterAddingMidMenuItem($midmenuItem1, false, parseXMLHttpResponse(XMLHttpResponse));
-									});
-							    }
-						    });
-					    }, 0);						    					
-				    },
-				    error: function(XMLHttpResponse) {
-						handleError(XMLHttpResponse, function() {
-							afterAddingMidMenuItem($midmenuItem1, false, parseXMLHttpResponse(XMLHttpResponse));	
-						});
+		$("#acquire_new_ip_button").hide();
+		$("#add_load_balancer_and_ip_button").show();
+		
+		initDialog("dialog_add_load_balancer_and_ip");
+		
+		$.ajax({
+		    data: createURL("command=listZones&available=true"),
+			dataType: "json",
+			success: function(json) {
+				var zones = json.listzonesresponse.zone;				
+				var zoneSelect = $("#dialog_add_load_balancer_and_ip #acquire_zone").empty();	
+				if (zones != null && zones.length > 0) {	
+				    for (var i = 0; i < zones.length; i++) {
+				    	if(zones[i].networktype == "Basic")
+					        zoneSelect.append("<option value='" + zones[i].id + "'>" + fromdb(zones[i].name) + "</option>"); 
 				    }
-			    });
-			},
-			"Cancel": function() { 
-				$(this).dialog("close"); 
+			    }
 			}
-		}).dialog("open");			
-		return false;
-	});
-    //*** Acquire New IP (end) ***
-    
-    //*** Port Range tab (begin) ***
-    var $createPortRangeRow = $("#tab_content_port_range").find("#create_port_range_row");     
-  
-    $createPortRangeRow.find("#add_link").bind("click", function(event){	        
-		var isValid = true;							
-		isValid &= validateInteger("Start Port", $createPortRangeRow.find("#start_port"), $createPortRangeRow.find("#start_port_errormsg"), 1, 65535);
-		isValid &= validateInteger("End Port", $createPortRangeRow.find("#end_port"), $createPortRangeRow.find("#end_port_errormsg"), 1, 65535);				
-		if (!isValid) 
-		    return;			
-	    
-	    var $template = $("#port_range_template").clone();
-	    $("#tab_content_port_range #grid_content").append($template.show());		
-	    
-	    var $spinningWheel = $template.find("#row_container").find("#spinning_wheel");	
-	    $spinningWheel.find("#description").text(g_dictionary["label.adding.processing"]);	
-        $spinningWheel.show();   
-	    	    
-	    var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");       
-        var ipObj = $midmenuItem1.data("jsonObj");          	        
-		
-		var startPort = $createPortRangeRow.find("#start_port").val();
-	    var endPort = $createPortRangeRow.find("#end_port").val();
-	    var protocol = $createPortRangeRow.find("#protocol").val();
-	   	    
-	    var array1 = [];
-        array1.push("&ipaddressid="+ipObj.id);           
-        array1.push("&startPort="+startPort);
-        array1.push("&endPort="+endPort);
-        array1.push("&protocol="+protocol);
-                
-        $.ajax({
-            data: createURL("command=createIpForwardingRule"+array1.join("")),
-            dataType: "json",           
-            success: function(json) {                                    	                        
-                var jobId = json.createipforwardingruleresponse.jobid;                  			                        
-                var timerKey = "asyncJob_" + jobId;					                       
-                $("body").everyTime(
-                    10000,
-                    timerKey,
-                    function() {
-                        $.ajax({
-                            data: createURL("command=queryAsyncJobResult&jobId="+jobId),
-	                        dataType: "json",									                    					                    
-	                        success: function(json) {		                                              							                       
-		                        var result = json.queryasyncjobresultresponse;										                   
-		                        if (result.jobstatus == 0) {
-			                        return; //Job has not completed
-		                        } else {											                    
-			                        $("body").stopTime(timerKey);				                        
-			                        $spinningWheel.hide();  			                                 		                       
-			                        if (result.jobstatus == 1) { // Succeeded 				                            
-	                                    var item = json.queryasyncjobresultresponse.jobresult.ipforwardingrule;		       	        	
-	                                    portRangeJsonToTemplate(item, $template);
-	                                    $spinningWheel.hide();   
-	                                    refreshCreatePortRangeRow();			 
-			                        } else if (result.jobstatus == 2) { // Failed			                            
-				                        $template.slideUp("slow", function() {
-					                        $(this).remove();
-				                        });
-				                        //var errorMsg = g_dictionary["label.failed"] + " - " + g_dictionary["label.error.code"] + " " + fromdb(result.jobresult.errorcode);
-	                                    var errorMsg = g_dictionary["label.failed"] + " - " + fromdb(result.jobresult.errortext);	
-	                                    $("#dialog_error").text(errorMsg).dialog("open");
-			                        }											                    
-		                        }
-	                        },
-	                        error: function(XMLHttpResponse) {	                  
-		                        $("body").stopTime(timerKey);	
-								handleError(XMLHttpResponse, function() {
-					                $template.slideUp("slow", function() {
-						                $(this).remove();
-					                });
-					                var errorMsg = parseXMLHttpResponse(XMLHttpResponse);				
-		                            $("#dialog_error").text(fromdb(errorMsg)).dialog("open");
-				                });								
-	                        }
-                        });
-                    },
-                    0
-                );
-            },
-            error: function(XMLHttpResponse) {	
-                handleError(XMLHttpResponse, function() {
-	                $template.slideUp("slow", function() {
-		                $(this).remove();
-	                });
-	                var errorMsg = parseXMLHttpResponse(XMLHttpResponse);				
-                    $("#dialog_error").text(fromdb(errorMsg)).dialog("open");
-                });		
-            }
-        });    	    
-	    
-	    return false;
-	});
-    //*** Port Range tab (end) ***
-   
-    //*** Port Forwarding tab (begin) ***
-    var $createPortForwardingRow = $("#tab_content_port_forwarding").find("#create_port_forwarding_row");     
-     
-    // If public end port gets filled, disable private ports and copy public ports over to private ports
-    /*
-    $createPortForwardingRow.find("#public_end_port").bind("keyup", function(event) {
-       	if($(this).val() != null && $(this).val().length > 0) {    		
-       		$createPortForwardingRow.find("#private_port").attr("readonly", true); 
-       		$createPortForwardingRow.find("#private_end_port").attr("readonly", true); 
-       		
-       		$createPortForwardingRow.find("#private_port").val($createPortForwardingRow.find("#public_port").val());
-       		$createPortForwardingRow.find("#private_end_port").val($(this).val());
-       	}
-       	else {    		
-       		$createPortForwardingRow.find("#private_port").removeAttr("readonly");    
-       		$createPortForwardingRow.find("#private_end_port").removeAttr("readonly");  
-       	}       	
-       	return true;
-    });           
-    $createPortForwardingRow.find("#public_port").bind("keyup", function(event) {
-        if($createPortForwardingRow.find("#private_port").attr("readonly") == true)
-        	$createPortForwardingRow.find("#private_port").val($(this).val());       	
-       	return true;
-    });    
-    */
-    
-    $createPortForwardingRow.find("#add_link").bind("click", function(event){	        
-		var isValid = true;		
-	
-		isValid &= validateCIDRList("CIDR", $createPortForwardingRow.find("#cidr"), $createPortForwardingRow.find("#cidr_errormsg"), true); //optional		
+		});
 				
-		isValid &= validateInteger("Public Port", $createPortForwardingRow.find("#public_port"), $createPortForwardingRow.find("#public_port_errormsg"), 1, 65535, false); //required
-		isValid &= validateInteger("Public End Port", $createPortForwardingRow.find("#public_end_port"), $createPortForwardingRow.find("#public_end_port_errormsg"), 1, 65535, true); //optional
-		
-		isValid &= validateInteger("Private Port", $createPortForwardingRow.find("#private_port"), $createPortForwardingRow.find("#private_port_errormsg"), 1, 65535, false); //required		
-		isValid &= validateInteger("Private End Port", $createPortForwardingRow.find("#private_end_port"), $createPortForwardingRow.find("#private_end_port_errormsg"), 1, 65535, true); //optional				
-		
-		isValid &= validateDropDownBox("Instance", $createPortForwardingRow.find("#vm"), $createPortForwardingRow.find("#vm_errormsg"));	
-		if (!isValid) 
-		    return;			
+		$("#add_load_balancer_and_ip_button").unbind("click").bind("click", function(event) {  			
+			$("#dialog_add_load_balancer_and_ip").dialog('option', 'buttons', {				
+				"Acquire": function() { 
+					var $thisDialog = $(this);	
+					
+					var isValid = true;					
+					isValid &= validateString("Name", $thisDialog.find("#name"), $thisDialog.find("#name_errormsg"));
+					isValid &= validateInteger("Public Port", $thisDialog.find("#public_port"), $thisDialog.find("#public_port_errormsg"), 1, 65535);
+					isValid &= validateInteger("Private Port", $thisDialog.find("#private_port"), $thisDialog.find("#private_port_errormsg"), 1, 65535);				
+					if (!isValid) 
+						return;
+															
+					$thisDialog.dialog("close");
+															   
+				    var array1 = [];
+				    
+				    var zoneId = $thisDialog.find("#acquire_zone").val();		
+			        array1.push("&zoneid="+zoneId);    
+			        
+			        var name = $thisDialog.find("#name").val();  
+			        array1.push("&name="+todb(name));    
+			        
+			        var publicPort = $thisDialog.find("#public_port").val();
+			        array1.push("&publicport="+publicPort);
+			        
+			        var privatePort = $thisDialog.find("#private_port").val();
+			        array1.push("&privateport="+privatePort);
+			        
+			        var algorithm = $thisDialog.find("#algorithm_select").val();  
+			        array1.push("&algorithm="+algorithm);
+			       
+			        array1.push("&openfirewall=false"); //elasticLB(basicZone) has nothing to do with firewall, so do not open firewall  when creating LB rule in elasticLB(basicZone).
+			        
+			        var $midmenuItem1 = beforeAddingMidMenuItem() ;	
+			        $.ajax({
+				        data: createURL("command=createLoadBalancerRule"+array1.join("")),
+						dataType: "json",
+						success: function(json) {			        	    
+				        	var jobId = json.createloadbalancerruleresponse.jobid;				        
+					        var timerKey = "addLbAndIpJob_"+jobId;
+								    
+					        $("body").everyTime(2000, timerKey, function() {
+							    $.ajax({
+								    data: createURL("command=queryAsyncJobResult&jobId="+jobId),
+								    dataType: "json",
+								    success: function(json) {										       						   
+									    var result = json.queryasyncjobresultresponse;
+									    if (result.jobstatus == 0) {
+										    return; //Job has not completed
+									    } else {											    
+										    $("body").stopTime(timerKey);										    
+										    if (result.jobstatus == 1) {
+											    // Succeeded											    	
+										    	var publicipid = result.jobresult.loadbalancer.publicipid;	
+										    	
+										    	var cmd;
+										    	if(g_supportELB == "guest") {
+										    		cmd = "command=listPublicIpAddresses&forvirtualnetwork=false&id="+publicipid;
+										    	}
+										    	else if(g_supportELB == "public") {
+										    		cmd = "command=listPublicIpAddresses&forvirtualnetwork=true&id="+publicipid;
+										    	}
+										    	else {
+										    		if(g_supportELB == null)
+										    	        alert("supportELB should be either guest or public. It should not be null.");
+										    	    else 
+										    	    	alert("supportELB should be either guest or public. It should not be " + g_supportELB);
+										    		return;
+										    	}
+										    		
+										        $.ajax({
+										            data: createURL(cmd),
+										            dataType: "json",
+										            async: false,
+										            success: function(json) {  
+										                var items = json.listpublicipaddressesresponse.publicipaddress;	
+										                if(items != null && items.length > 0) {
+										                    ipToMidmenu(items[0], $midmenuItem1);
+										                    bindClickToMidMenu($midmenuItem1, ipToRightPanel, ipGetMidmenuId);  
+										                    afterAddingMidMenuItem($midmenuItem1, true);	
+										                }
+										            }
+										        });                     
+										    } else if (result.jobstatus == 2) {
+										        afterAddingMidMenuItem($midmenuItem1, false, fromdb(result.jobresult.errortext));					        							        								   				    
+										    }
+									    }
+								    },
+								    error: function(XMLHttpResponse) {
+									    $("body").stopTime(timerKey);
+										handleError(XMLHttpResponse, function() {											
+											afterAddingMidMenuItem($midmenuItem1, false, parseXMLHttpResponse(XMLHttpResponse));
+										});
+								    }
+							    });
+						    }, 0);		
+						},
+						error: function(XMLHttpResponse) {
+							handleError(XMLHttpResponse, function() {
+								afterAddingMidMenuItem($midmenuItem1, false, parseXMLHttpResponse(XMLHttpResponse));	
+							});
+					    }
+					});  				
+				},
+				"Cancel": function() { 
+					$(this).dialog("close"); 
+				}
+			}).dialog("open");			
+			return false;
+		});		
+	}
+    //****** Basic Zone, support Elastic Load Balancer (end) *****************************************************************************************
+    
+    //****** Advanced Zone (begin) *******************************************************************************************************************
+    else {  
+    	if(g_firewallRuleUiEnabled == "true")
+    	    $("#tab_firewall").show();
+    	else
+    		$("#tab_firewall").hide();
+    	
+    	$("#tab_details,#tab_content_details").show();
+    	    	
+	    //dialogs
+	    initDialog("dialog_acquire_public_ip", 325);
+		initDialog("dialog_enable_vpn");
+		initDialog("dialog_disable_vpn");
+		initDialog("dialog_add_vpnuser");
+		initDialog("dialog_confirmation_remove_vpnuser");
+		initDialog("dialog_enable_static_NAT");
 	    
-	    var $template = $("#port_forwarding_template").clone();
-	    $("#tab_content_port_forwarding #grid_content").append($template.show());		
+	    //*** Acquire New IP (begin) ***
+		$.ajax({
+		    data: createURL("command=listZones&available=true"),
+			dataType: "json",
+			success: function(json) {
+				var zones = json.listzonesresponse.zone;				
+				var zoneSelect = $("#dialog_acquire_public_ip #acquire_zone").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>"); 
+				    }
+			    }
+			}
+		});
+		    
+	    $("#acquire_new_ip_button").unbind("click").bind("click", function(event) {  			
+			$("#dialog_acquire_public_ip").dialog('option', 'buttons', {				
+				"Acquire": function() { 
+					var thisDialog = $(this);	
+					thisDialog.dialog("close");
+							
+					var zoneid = thisDialog.find("#acquire_zone").val();				
+					
+					var $midmenuItem1 = beforeAddingMidMenuItem() ;	
+					
+					$.ajax({
+					    data: createURL("command=associateIpAddress&zoneid="+zoneid),
+					    dataType: "json",
+					    success: function(json) {						        
+					        var jobId = json.associateipaddressresponse.jobid;				        
+					        var timerKey = "associateIpJob_"+jobId;
+								    
+					        $("body").everyTime(2000, timerKey, function() {
+							    $.ajax({
+								    data: createURL("command=queryAsyncJobResult&jobId="+jobId),
+								    dataType: "json",
+								    success: function(json) {										       						   
+									    var result = json.queryasyncjobresultresponse;
+									    if (result.jobstatus == 0) {
+										    return; //Job has not completed
+									    } else {											    
+										    $("body").stopTime(timerKey);
+										    if (result.jobstatus == 1) {
+											    // Succeeded										    							   
+											    ipToMidmenu(result.jobresult.ipaddress, $midmenuItem1);
+							                    bindClickToMidMenu($midmenuItem1, ipToRightPanel, ipGetMidmenuId);  
+							                    afterAddingMidMenuItem($midmenuItem1, true);	                            
+										    } else if (result.jobstatus == 2) {
+										        afterAddingMidMenuItem($midmenuItem1, false, fromdb(result.jobresult.errortext));					        							        								   				    
+										    }
+									    }
+								    },
+								    error: function(XMLHttpResponse) {
+									    $("body").stopTime(timerKey);
+										handleError(XMLHttpResponse, function() {
+											afterAddingMidMenuItem($midmenuItem1, false, parseXMLHttpResponse(XMLHttpResponse));
+										});
+								    }
+							    });
+						    }, 0);						    					
+					    },
+					    error: function(XMLHttpResponse) {
+							handleError(XMLHttpResponse, function() {
+								afterAddingMidMenuItem($midmenuItem1, false, parseXMLHttpResponse(XMLHttpResponse));	
+							});
+					    }
+				    });
+				},
+				"Cancel": function() { 
+					$(this).dialog("close"); 
+				}
+			}).dialog("open");			
+			return false;
+		});
+	    //*** Acquire New IP (end) ***
 	    
-	    var $spinningWheel = $template.find("#row_container").find("#spinning_wheel");	
-	    $spinningWheel.find("#description").text(g_dictionary["label.adding.processing"]);	
-        $spinningWheel.show();   
+	    //*** Firewall tab (begin) ***
+	    var $createFirewallRow = $("#tab_content_firewall").find("#create_firewall_row");     
+	  
+	    $createFirewallRow.find("#protocol").bind("click", function(event) {	
+	    	if($(this).val() == null)
+	    		return true;
+	    	var protocol = $(this).val().toLowerCase();	    
+	    	if(protocol == "tcp" || protocol == "udp") {
+	    		$createFirewallRow.find("#start_port,#end_port").show();
+	    		$createFirewallRow.find("#ICMP_type,#ICMP_code").hide();
+	    		$createFirewallRow.find("#ICMP_type,#ICMP_code").val("")
+	    	}
+	    	else { //protocol == icmp
+	    		$createFirewallRow.find("#ICMP_type,#ICMP_code").show();
+	    		$createFirewallRow.find("#start_port,#end_port").hide();
+	    		$createFirewallRow.find("#start_port,#end_port").val("");
+	    	}	    	
+	    	return true;
+	    });
 	    	    
-	    var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");       
-        var ipObj = $midmenuItem1.data("jsonObj");            	        
-			
-        var array1 = [];
-        array1.push("&ipaddressid="+ipObj.id);           
-        
-        var cidr = $createPortForwardingRow.find("#cidr").val();
-        if(cidr != null && cidr.length > 0)
-        	array1.push("&cidrlist="+cidr);
-        
-	    var publicPort = $createPortForwardingRow.find("#public_port").val();
-	    array1.push("&publicport="+publicPort);	    
-	    var publicEndPort = $createPortForwardingRow.find("#public_end_port").val();
-	    if(publicEndPort != null && publicEndPort.length > 0)
-	    	array1.push("&publicendport="+publicEndPort);
-	    
-	    var privatePort = $createPortForwardingRow.find("#private_port").val();
-	    array1.push("&privateport="+privatePort);	    
-	    var privateEndPort = $createPortForwardingRow.find("#private_end_port").val();
-	    if(privateEndPort != null && privateEndPort.length > 0)
-	    	array1.push("&privateendport="+privateEndPort);
-	    
-	    var protocol = $createPortForwardingRow.find("#protocol").val();
-	    array1.push("&protocol="+protocol);
-	    
-	    var virtualMachineId = $createPortForwardingRow.find("#vm").val();	
-        array1.push("&virtualmachineid=" + virtualMachineId);
-        
-        $.ajax({
-            data: createURL("command=createPortForwardingRule"+array1.join("")),
-            dataType: "json",           
-            success: function(json) {	                               	                        
-                var jobId = json.createportforwardingruleresponse.jobid;                  			                        
-                var timerKey = "asyncJob_" + jobId;					                       
-                $("body").everyTime(
-                    10000,
-                    timerKey,
-                    function() {
-                        $.ajax({
-                            data: createURL("command=queryAsyncJobResult&jobId="+jobId),
-	                        dataType: "json",									                    					                    
-	                        success: function(json) {		                                              							                       
-		                        var result = json.queryasyncjobresultresponse;										                   
-		                        if (result.jobstatus == 0) {
-			                        return; //Job has not completed
-		                        } else {											                    
-			                        $("body").stopTime(timerKey);				                        
-			                        $spinningWheel.hide();  			                                 		                       
-			                        if (result.jobstatus == 1) { // Succeeded 	
-	                                    var item = json.queryasyncjobresultresponse.jobresult.portforwardingrule;		       	        	
-	                                    portForwardingJsonToTemplate(item,$template);
-	                                    $spinningWheel.hide();   
-	                                    refreshCreatePortForwardingRow();			 
-			                        } else if (result.jobstatus == 2) { // Failed			                            
-				                        $template.slideUp("slow", function() {
-					                        $(this).remove();
-				                        });
-				                        //var errorMsg = g_dictionary["label.failed"] + " - " + g_dictionary["label.error.code"] + " " + fromdb(result.jobresult.errorcode);
-	                                    var errorMsg = g_dictionary["label.failed"] + " - " + fromdb(result.jobresult.errortext);	
-	                                    $("#dialog_error").text(errorMsg).dialog("open");
-			                        }											                    
+	    $createFirewallRow.find("#add_link").bind("click", function(event){	  	 	
+	    	var isValid = true;		
+			isValid &= validateCIDRList("Source CIDR", $createFirewallRow.find("#cidr"), $createFirewallRow.find("#cidr_errormsg"), true); //optional								
+			if($createFirewallRow.find("#start_port").css("display") != "none")
+			    isValid &= validateInteger("Start Port", $createFirewallRow.find("#start_port"), $createFirewallRow.find("#start_port_errormsg"), 1, 65535);
+			if($createFirewallRow.find("#end_port").css("display") != "none")
+			    isValid &= validateInteger("End Port", $createFirewallRow.find("#end_port"), $createFirewallRow.find("#end_port_errormsg"), 1, 65535);				
+			if($createFirewallRow.find("#ICMP_type").css("display") != "none") 
+				isValid &= validateInteger("ICMP type", $createFirewallRow.find("#ICMP_type"), $createFirewallRow.find("#ICMP_type_errormsg"), null, null);
+			if($createFirewallRow.find("#ICMP_code").css("display") != "none") 
+				isValid &= validateInteger("ICMP code", $createFirewallRow.find("#ICMP_code"), $createFirewallRow.find("#ICMP_code_errormsg"), null, null);
+			if (!isValid) 
+			    return;			
+		    
+		    var $template = $("#firewall_template").clone();
+		    $("#tab_content_firewall #grid_content").append($template.show());		
+		    
+		    var $spinningWheel = $template.find("#row_container").find("#spinning_wheel");	
+		    $spinningWheel.find("#description").text(g_dictionary["label.adding.processing"]);	
+	        $spinningWheel.show();   
+		    	    
+		    var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");       
+	        var ipObj = $midmenuItem1.data("jsonObj");          	        
+				   	    
+		    var array1 = [];
+		    array1.push("&ipaddressid="+ipObj.id);    
+		    
+		    var cidr = $createFirewallRow.find("#cidr").val();
+	        if(cidr != null && cidr.length > 0)
+	        	array1.push("&cidrlist="+cidr);
+		    
+	        if($createFirewallRow.find("#start_port").css("display") != "none") {
+		        var startPort = $createFirewallRow.find("#start_port").val();       
+		        array1.push("&startPort="+startPort);
+	        }
+	        
+	        if($createFirewallRow.find("#end_port").css("display") != "none") {
+		        var endPort = $createFirewallRow.find("#end_port").val();
+		        array1.push("&endPort="+endPort);
+	        }
+	        
+	        var protocol = $createFirewallRow.find("#protocol").val();
+	        array1.push("&protocol="+protocol);
+	         
+	        if($createFirewallRow.find("#ICMP_type").css("display") != "none") {
+		        var ICMPType = $createFirewallRow.find("#ICMP_type").val();       
+		        array1.push("&icmptype="+ICMPType);
+	        }
+	        if($createFirewallRow.find("#ICMP_code").css("display") != "none") {
+		        var ICMPCode = $createFirewallRow.find("#ICMP_code").val();       
+		        array1.push("&icmpcode="+ICMPCode);
+	        }
+	        
+	        $.ajax({
+	            data: createURL("command=createFirewallRule"+array1.join("")),
+	            dataType: "json",           
+	            success: function(json) {                      
+	                var jobId = json.createfirewallruleresponse.jobid;                  			                        
+	                var timerKey = "asyncJob_" + jobId;					                       
+	                $("body").everyTime(
+	                    10000,
+	                    timerKey,
+	                    function() {
+	                        $.ajax({
+	                            data: createURL("command=queryAsyncJobResult&jobId="+jobId),
+		                        dataType: "json",									                    					                    
+		                        success: function(json) {		                                              							                       
+			                        var result = json.queryasyncjobresultresponse;										                   
+			                        if (result.jobstatus == 0) {
+				                        return; //Job has not completed
+			                        } else {											                    
+				                        $("body").stopTime(timerKey);				                        
+				                        $spinningWheel.hide();  			                                 		                       
+				                        if (result.jobstatus == 1) { // Succeeded 					                       		                            
+		                                    var item = json.queryasyncjobresultresponse.jobresult.firewallrule;		       	        	
+		                                    firewallJsonToTemplate(item, $template);
+		                                    $spinningWheel.hide();   
+		                                    refreshCreateFirewallRow();			 
+				                        } else if (result.jobstatus == 2) { // Failed			                            
+					                        $template.slideUp("slow", function() {
+						                        $(this).remove();
+					                        });
+					                        var errorMsg = g_dictionary["label.failed"] + " - " + fromdb(result.jobresult.errortext);	
+		                                    $("#dialog_error").text(errorMsg).dialog("open");
+				                        }											                    
+			                        }
+		                        },
+		                        error: function(XMLHttpResponse) {	                  
+			                        $("body").stopTime(timerKey);	
+									handleError(XMLHttpResponse, function() {
+						                $template.slideUp("slow", function() {
+							                $(this).remove();
+						                });
+						                var errorMsg = parseXMLHttpResponse(XMLHttpResponse);				
+			                            $("#dialog_error").text(fromdb(errorMsg)).dialog("open");
+					                });								
 		                        }
-	                        },
-	                        error: function(XMLHttpResponse) {	                  
-		                        $("body").stopTime(timerKey);	
-								handleError(XMLHttpResponse, function() {
-					                $template.slideUp("slow", function() {
-						                $(this).remove();
-					                });
-					                var errorMsg = parseXMLHttpResponse(XMLHttpResponse);				
-		                            $("#dialog_error").text(fromdb(errorMsg)).dialog("open");
-				                });								
-	                        }
-                        });
-                    },
+	                        });
+                        },
+	                    0
+	                );
+	            },
+	            error: function(XMLHttpResponse) {	
+	                handleError(XMLHttpResponse, function() {
+		                $template.slideUp("slow", function() {
+			                $(this).remove();
+		                });
+		                var errorMsg = parseXMLHttpResponse(XMLHttpResponse);				
+	                    $("#dialog_error").text(fromdb(errorMsg)).dialog("open");
+	                });		
+	            }
+	        });    	    
+		    
+		    return false;
+		});
+	    //*** Firewall tab (end) ***
+	    
+	    //*** Port Range tab (begin) ***
+	    var $createPortRangeRow = $("#tab_content_port_range").find("#create_port_range_row");     
+	  
+	    $createPortRangeRow.find("#add_link").bind("click", function(event){	        
+			var isValid = true;							
+			isValid &= validateInteger("Start Port", $createPortRangeRow.find("#start_port"), $createPortRangeRow.find("#start_port_errormsg"), 1, 65535);
+			isValid &= validateInteger("End Port", $createPortRangeRow.find("#end_port"), $createPortRangeRow.find("#end_port_errormsg"), 1, 65535);				
+			if (!isValid) 
+			    return;			
+		    
+		    var $template = $("#port_range_template").clone();
+		    $("#tab_content_port_range #grid_content").append($template.show());		
+		    
+		    var $spinningWheel = $template.find("#row_container").find("#spinning_wheel");	
+		    $spinningWheel.find("#description").text(g_dictionary["label.adding.processing"]);	
+	        $spinningWheel.show();   
+		    	    
+		    var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");       
+	        var ipObj = $midmenuItem1.data("jsonObj");          	        
+			
+			var startPort = $createPortRangeRow.find("#start_port").val();
+		    var endPort = $createPortRangeRow.find("#end_port").val();
+		    var protocol = $createPortRangeRow.find("#protocol").val();
+		   	    
+		    var array1 = [];
+	        array1.push("&ipaddressid="+ipObj.id);           
+	        array1.push("&startPort="+startPort);
+	        array1.push("&endPort="+endPort);
+	        array1.push("&protocol="+protocol);
+	           
+	        if(g_firewallRuleUiEnabled == "true")
+	        	array1.push("&openfirewall=false");
+	        
+	        $.ajax({
+	            data: createURL("command=createIpForwardingRule"+array1.join("")),
+	            dataType: "json",           
+	            success: function(json) {                                    	                        
+	                var jobId = json.createipforwardingruleresponse.jobid;                  			                        
+	                var timerKey = "asyncJob_" + jobId;					                       
+	                $("body").everyTime(
+	                    10000,
+	                    timerKey,
+	                    function() {
+	                        $.ajax({
+	                            data: createURL("command=queryAsyncJobResult&jobId="+jobId),
+		                        dataType: "json",									                    					                    
+		                        success: function(json) {		                                              							                       
+			                        var result = json.queryasyncjobresultresponse;										                   
+			                        if (result.jobstatus == 0) {
+				                        return; //Job has not completed
+			                        } else {											                    
+				                        $("body").stopTime(timerKey);				                        
+				                        $spinningWheel.hide();  			                                 		                       
+				                        if (result.jobstatus == 1) { // Succeeded 				                            
+		                                    var item = json.queryasyncjobresultresponse.jobresult.ipforwardingrule;		       	        	
+		                                    portRangeJsonToTemplate(item, $template);
+		                                    $spinningWheel.hide();   
+		                                    refreshCreatePortRangeRow();			 
+				                        } else if (result.jobstatus == 2) { // Failed			                            
+					                        $template.slideUp("slow", function() {
+						                        $(this).remove();
+					                        });
+					                        //var errorMsg = g_dictionary["label.failed"] + " - " + g_dictionary["label.error.code"] + " " + fromdb(result.jobresult.errorcode);
+		                                    var errorMsg = g_dictionary["label.failed"] + " - " + fromdb(result.jobresult.errortext);	
+		                                    $("#dialog_error").text(errorMsg).dialog("open");
+				                        }											                    
+			                        }
+		                        },
+		                        error: function(XMLHttpResponse) {	                  
+			                        $("body").stopTime(timerKey);	
+									handleError(XMLHttpResponse, function() {
+						                $template.slideUp("slow", function() {
+							                $(this).remove();
+						                });
+						                var errorMsg = parseXMLHttpResponse(XMLHttpResponse);				
+			                            $("#dialog_error").text(fromdb(errorMsg)).dialog("open");
+					                });								
+		                        }
+	                        });
+                        },
+
                     0
                 );
             },
-            error: function(XMLHttpResponse) {	
+            error: function(XMLHttpResponse) {	
                 handleError(XMLHttpResponse, function() {
 	                $template.slideUp("slow", function() {
 		                $(this).remove();
-	                });
-	                var errorMsg = parseXMLHttpResponse(XMLHttpResponse);				
-                    $("#dialog_error").text(fromdb(errorMsg)).dialog("open");
+	                });
+	                var errorMsg = parseXMLHttpResponse(XMLHttpResponse);				
+                    $("#dialog_error").text(fromdb(errorMsg)).dialog("open");
                 });		
             }
         });    	    
 	    
 	    return false;
-	});
-    //*** Port Forwarding tab (end) ***
-    
-    //*** Load Balancer tab (begin) ***
+	});
+    //*** Port Range tab (end) ***
+   
+    //*** Port Forwarding tab (begin) ***
+    var $createPortForwardingRow = $("#tab_content_port_forwarding").find("#create_port_forwarding_row");     
+     
+    // If public end port gets filled, disable private ports and copy public ports over to private ports
+    /*
+    $createPortForwardingRow.find("#public_end_port").bind("keyup", function(event) {
+       	if($(this).val() != null && $(this).val().length > 0) {    		
+       		$createPortForwardingRow.find("#private_port").attr("readonly", true); 
+       		$createPortForwardingRow.find("#private_end_port").attr("readonly", true); 
+       		
+       		$createPortForwardingRow.find("#private_port").val($createPortForwardingRow.find("#public_port").val());
+       		$createPortForwardingRow.find("#private_end_port").val($(this).val());
+       	}
+       	else {    		
+       		$createPortForwardingRow.find("#private_port").removeAttr("readonly");    
+       		$createPortForwardingRow.find("#private_end_port").removeAttr("readonly");  
+       	}       	
+       	return true;
+    });           
+    $createPortForwardingRow.find("#public_port").bind("keyup", function(event) {
+        if($createPortForwardingRow.find("#private_port").attr("readonly") == true)
+        	$createPortForwardingRow.find("#private_port").val($(this).val());       	
+       	return true;
+    });    
+    */
+    
+    $createPortForwardingRow.find("#add_link").bind("click", function(event){	        
+		var isValid = true;		
+	
+		//isValid &= validateCIDRList("CIDR", $createPortForwardingRow.find("#cidr"), $createPortForwardingRow.find("#cidr_errormsg"), true); //optional		
+				
+		isValid &= validateInteger("Public Port", $createPortForwardingRow.find("#public_port"), $createPortForwardingRow.find("#public_port_errormsg"), 1, 65535, false); //required
+		isValid &= validateInteger("Public End Port", $createPortForwardingRow.find("#public_end_port"), $createPortForwardingRow.find("#public_end_port_errormsg"), 1, 65535, true); //optional
+		
+		isValid &= validateInteger("Private Port", $createPortForwardingRow.find("#private_port"), $createPortForwardingRow.find("#private_port_errormsg"), 1, 65535, false); //required		
+		isValid &= validateInteger("Private End Port", $createPortForwardingRow.find("#private_end_port"), $createPortForwardingRow.find("#private_end_port_errormsg"), 1, 65535, true); //optional				
+		
+	    isValid &= validateDropDownBox("Instance", $createPortForwardingRow.find("#vm"), $createPortForwardingRow.find("#vm_errormsg"));	
+		if (!isValid) 
+		    return;			
+		    
+		    var $template = $("#port_forwarding_template").clone();
+		    $("#tab_content_port_forwarding #grid_content").append($template.show());		
+		    
+		    var $spinningWheel = $template.find("#row_container").find("#spinning_wheel");	
+		    $spinningWheel.find("#description").text(g_dictionary["label.adding.processing"]);	
+	        $spinningWheel.show();   
+		    	    
+		    var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");       
+	        var ipObj = $midmenuItem1.data("jsonObj");            	        
+				
+	        var array1 = [];
+	        array1.push("&ipaddressid="+ipObj.id);           
+	        	      
+		    var publicPort = $createPortForwardingRow.find("#public_port").val();
+		    array1.push("&publicport="+publicPort);	    
+		    var publicEndPort = $createPortForwardingRow.find("#public_end_port").val();
+		    if(publicEndPort != null && publicEndPort.length > 0)
+		    	array1.push("&publicendport="+publicEndPort);
+		    
+		    var privatePort = $createPortForwardingRow.find("#private_port").val();
+		    array1.push("&privateport="+privatePort);	    
+		    var privateEndPort = $createPortForwardingRow.find("#private_end_port").val();
+		    if(privateEndPort != null && privateEndPort.length > 0)
+		    	array1.push("&privateendport="+privateEndPort);
+		    
+		    var protocol = $createPortForwardingRow.find("#protocol").val();
+		    array1.push("&protocol="+protocol);
+		    
+		    var virtualMachineId = $createPortForwardingRow.find("#vm").val();	
+	        array1.push("&virtualmachineid=" + virtualMachineId);
+	        
+	        if(g_firewallRuleUiEnabled == "true")
+	        	array1.push("&openfirewall=false");
+	        
+	        $.ajax({
+	            data: createURL("command=createPortForwardingRule"+array1.join("")),
+	            dataType: "json",           
+	            success: function(json) {	                               	                        
+	                var jobId = json.createportforwardingruleresponse.jobid;                  			                        
+	                var timerKey = "asyncJob_" + jobId;					                       
+	                $("body").everyTime(
+	                    10000,
+	                    timerKey,
+	                    function() {
+	                        $.ajax({
+	                            data: createURL("command=queryAsyncJobResult&jobId="+jobId),
+		                        dataType: "json",									                    					                    
+		                        success: function(json) {		                                              							                       
+			                        var result = json.queryasyncjobresultresponse;										                   
+			                        if (result.jobstatus == 0) {
+				                        return; //Job has not completed
+			                        } else {											                    
+				                        $("body").stopTime(timerKey);				                        
+				                        $spinningWheel.hide();  			                                 		                       
+				                        if (result.jobstatus == 1) { // Succeeded 	
+		                                    var item = json.queryasyncjobresultresponse.jobresult.portforwardingrule;		       	        	
+		                                    portForwardingJsonToTemplate(item,$template);
+		                                    $spinningWheel.hide();   
+		                                    refreshCreatePortForwardingRow();			 
+				                        } else if (result.jobstatus == 2) { // Failed			                            
+					                        $template.slideUp("slow", function() {
+						                        $(this).remove();
+					                        });
+					                        //var errorMsg = g_dictionary["label.failed"] + " - " + g_dictionary["label.error.code"] + " " + fromdb(result.jobresult.errorcode);
+		                                    var errorMsg = g_dictionary["label.failed"] + " - " + fromdb(result.jobresult.errortext);	
+		                                    $("#dialog_error").text(errorMsg).dialog("open");
+				                        }											                    
+			                        }
+		                        },
+		                        error: function(XMLHttpResponse) {	                  
+			                        $("body").stopTime(timerKey);	
+									handleError(XMLHttpResponse, function() {
+						                $template.slideUp("slow", function() {
+							                $(this).remove();
+						                });
+						                var errorMsg = parseXMLHttpResponse(XMLHttpResponse);				
+			                            $("#dialog_error").text(fromdb(errorMsg)).dialog("open");
+					                });								
+		                        }
+	                        });
+	                    },
+	                    0
+	                );
+	            },
+	            error: function(XMLHttpResponse) {	
+	                handleError(XMLHttpResponse, function() {
+		                $template.slideUp("slow", function() {
+			                $(this).remove();
+		                });
+		                var errorMsg = parseXMLHttpResponse(XMLHttpResponse);				
+	                    $("#dialog_error").text(fromdb(errorMsg)).dialog("open");
+	                });		
+	            }
+	        });    	    
+		    
+		    return false;
+		});
+	    //*** Port Forwarding tab (end) ***
+    }
+        
+    //*** Load Balancer tab (begin) ***
     var createLoadBalancerRow = $("#tab_content_load_balancer #create_load_balancer_row");
     
     createLoadBalancerRow.find("#add_link").bind("click", function(event){		
 	    // validate values		    
-		var isValid = true;		
-		isValid &= validateCIDRList("CIDR", createLoadBalancerRow.find("#cidr"), createLoadBalancerRow.find("#cidr_errormsg"), true); //optional		
+		var isValid = true;		
+		//isValid &= validateCIDRList("CIDR", createLoadBalancerRow.find("#cidr"), createLoadBalancerRow.find("#cidr_errormsg"), true); //optional		
 		isValid &= validateString("Name", createLoadBalancerRow.find("#name"), createLoadBalancerRow.find("#name_errormsg"));
 		isValid &= validateInteger("Public Port", createLoadBalancerRow.find("#public_port"), createLoadBalancerRow.find("#public_port_errormsg"), 1, 65535);
 		isValid &= validateInteger("Private Port", createLoadBalancerRow.find("#private_port"), createLoadBalancerRow.find("#private_port_errormsg"), 1, 65535);				
@@ -417,73 +704,110 @@ function afterLoadIpJSP() {
         var ipObj = $midmenuItem1.data("jsonObj");
        	 	    
 	    var array1 = [];
-        array1.push("&publicipid="+ipObj.id);  
-        
-        var cidr = createLoadBalancerRow.find("#cidr").val();
-        if(cidr != null && cidr.length > 0)
-        	array1.push("&cidrlist="+cidr);
-        
+        array1.push("&publicipid="+ipObj.id);  
+       
         var name = createLoadBalancerRow.find("#name").val();  
-        array1.push("&name="+todb(name));              
-        
+        array1.push("&name="+todb(name));              
+        
         var publicPort = createLoadBalancerRow.find("#public_port").val();
-        array1.push("&publicport="+publicPort);
-        
+        array1.push("&publicport="+publicPort);
+        
         var privatePort = createLoadBalancerRow.find("#private_port").val();
-        array1.push("&privateport="+privatePort);
-        
+        array1.push("&privateport="+privatePort);
+        
         var algorithm = createLoadBalancerRow.find("#algorithm_select").val();  
         array1.push("&algorithm="+algorithm);
-       
+        
+        if(g_firewallRuleUiEnabled == "true")
+        	array1.push("&openfirewall=false");
+        
         $.ajax({
 	        data: createURL("command=createLoadBalancerRule"+array1.join("")),
 			dataType: "json",
-			success: function(json) {	
-				var item = json.createloadbalancerruleresponse.loadbalancer;				
-	            loadBalancerJsonToTemplate(item, $template);
-	            $spinningWheel.hide();   
-	            refreshCreateLoadBalancerRow();	            	
+			success: function(json) {			        	    
+	        	var jobId = json.createloadbalancerruleresponse.jobid;				        
+		        var timerKey = "addLbJob_"+jobId;
+					    
+		        $("body").everyTime(2000, timerKey, function() {
+				    $.ajax({
+					    data: createURL("command=queryAsyncJobResult&jobId="+jobId),
+					    dataType: "json",
+					    success: function(json) {										       						   
+						    var result = json.queryasyncjobresultresponse;
+						    if (result.jobstatus == 0) {
+							    return; //Job has not completed
+						    } else {											    
+							    $("body").stopTime(timerKey);										    
+							    if (result.jobstatus == 1) {
+								    // Succeeded	
+							    	var item = result.jobresult.loadbalancer;								    				
+						            loadBalancerJsonToTemplate(item, $template);
+						            $spinningWheel.hide();   
+						            refreshCreateLoadBalancerRow();
+							    } else if (result.jobstatus == 2) {
+							    	$template.slideUp("slow", function() {
+										$(this).remove();
+									});
+									var errorMsg = fromdb(result.jobresult.errortext);				
+						            $("#dialog_error").text(fromdb(errorMsg)).dialog("open");
+							    }
+						    }
+					    },
+					    error: function(XMLHttpResponse) {
+						    $("body").stopTime(timerKey);
+							handleError(XMLHttpResponse, function() {	
+								$template.slideUp("slow", function() {
+									$(this).remove();
+								});
+								var errorMsg = parseXMLHttpResponse(XMLHttpResponse);				
+					            $("#dialog_error").text(fromdb(errorMsg)).dialog("open");								
+							});
+					    }
+				    });
+			    }, 0);		
 			},
-		    error: function(XMLHttpResponse) {				    
-			    handleError(XMLHttpResponse, function() {
+			error: function(XMLHttpResponse) {
+				handleError(XMLHttpResponse, function() {					
 					$template.slideUp("slow", function() {
 						$(this).remove();
-					});
-					var errorMsg = parseXMLHttpResponse(XMLHttpResponse);				
-		            $("#dialog_error").text(fromdb(errorMsg)).dialog("open");
+					});
+					var errorMsg = parseXMLHttpResponse(XMLHttpResponse);				
+		            $("#dialog_error").text(fromdb(errorMsg)).dialog("open");					
 				});
-		    }			
-		});  	    
+		    }
+		});  
+       
 	    return false;
-	});
-	//*** Load Balancer tab (end) ***
-}
-
-function ipGetMidmenuId(jsonObj) {   
-    return ipGetMidmenuId2(jsonObj.ipaddress);
-}
-
-function ipGetMidmenuId2(ipaddress) {  
-    return "midmenuItem_" + ipaddress.replace(/\./g, "_");   //e.g. "192.168.33.108" => "192_168_33_108"
-}
-
-function ipToMidmenu(jsonObj, $midmenuItem1) {    
-    var id = ipGetMidmenuId(jsonObj);
-    $midmenuItem1.attr("id", id);  
-    $midmenuItem1.data("jsonObj", jsonObj); 
-    
-    var $iconContainer = $midmenuItem1.find("#icon_container").show();
-    $iconContainer.find("#icon").attr("src", "images/midmenuicon_network_networkgroup.png");
-    
-	var firstRowText = fromdb(jsonObj.ipaddress);
-	if (jsonObj.issourcenat == true) 
-		firstRowText += "[source nat]";	
-    $midmenuItem1.find("#first_row").text(firstRowText.substring(0,midMenuFirstRowLength));     
-    $midmenuItem1.find("#first_row_container").attr("title", firstRowText);   
-    
-    var secondRowText = "owned by: "+fromdb(jsonObj.account);
-    $midmenuItem1.find("#second_row").text(secondRowText.substring(0,midMenuSecondRowLength));
-    $midmenuItem1.find("#second_row_container").attr("title", secondRowText); 
+	});
+	//*** Load Balancer tab (end) ***    
+    //****** Advanced Zone (end) *******************************************************************************************************************
+}
+
+function ipGetMidmenuId(jsonObj) {   
+    return ipGetMidmenuId2(jsonObj.ipaddress);
+}
+
+function ipGetMidmenuId2(ipaddress) {  
+    return "midmenuItem_" + ipaddress.replace(/\./g, "_");   //e.g. "192.168.33.108" => "192_168_33_108"
+}
+
+function ipToMidmenu(jsonObj, $midmenuItem1) {    
+    var id = ipGetMidmenuId(jsonObj);
+    $midmenuItem1.attr("id", id);  
+    $midmenuItem1.data("jsonObj", jsonObj); 
+    
+    var $iconContainer = $midmenuItem1.find("#icon_container").show();
+    $iconContainer.find("#icon").attr("src", "images/midmenuicon_network_networkgroup.png");
+    
+	var firstRowText = fromdb(jsonObj.ipaddress);
+	if (jsonObj.issourcenat == true) 
+		firstRowText += "[source nat]";	
+    $midmenuItem1.find("#first_row").text(firstRowText.substring(0,midMenuFirstRowLength));     
+    $midmenuItem1.find("#first_row_container").attr("title", firstRowText);   
+    
+    var secondRowText = "owned by: "+fromdb(jsonObj.account);
+    $midmenuItem1.find("#second_row").text(secondRowText.substring(0,midMenuSecondRowLength));
+    $midmenuItem1.find("#second_row_container").attr("title", secondRowText); 
 }
 
 function isIpManageable(domainid, account) {             
@@ -516,89 +840,159 @@ function ipToRightPanel($midmenuItem1) {
     copyActionInfoFromMidMenuToRightPanel($midmenuItem1);
     
     $("#right_panel_content").data("$midmenuItem1", $midmenuItem1);
-    $("#tab_details").click();        
+    
+    if(g_supportELB == "guest" || g_supportELB == "public")
+    	$("#tab_load_balancer").click();
+    else
+        $("#tab_details").click();        
    
     if(ipObj.isstaticnat == true) {
-        $("#tab_port_range").show();	
+    	if(g_firewallRuleUiEnabled == "true") {
+    		$("#tab_firewall").show();
+            $("#tab_port_range").hide();	
+    	} 
+    	else {
+    		$("#tab_firewall").hide();
+    		$("#tab_port_range").show();
+    	}
         $("#tab_port_forwarding, #tab_load_balancer, #tab_vpn").hide();	
     }
     else { //ipObj.isstaticnat == false  
         $("#tab_port_range").hide();
-        if(ipObj.forvirtualnetwork == true) { //(public network)            
-            if(isIpManageable(ipObj.domainid, ipObj.account) == true) {           
-	            //Port Forwarding tab
-	            if(networkObj != null) {
-	                var firewallServiceObj = ipFindNetworkServiceByName("Firewall", networkObj);
-	                if(firewallServiceObj != null) {
-			            var portForwardingCapabilityObj = ipFindCapabilityByName("PortForwarding", firewallServiceObj);
-			            if(portForwardingCapabilityObj != null) {
-			                if(portForwardingCapabilityObj.value == "true") 
-			                    $("#tab_port_forwarding").show();  			                
-			                else
-			                    $("#tab_port_forwarding").hide();    
-			            }
-			            else {
-			                $("#tab_port_forwarding").hide();    
-			            }	
-	                }
-	                else {
-	                    $("#tab_port_forwarding").hide();    
-	                }
-	            }
-	            else {
-	                $("#tab_port_forwarding").hide();    
-	            }
-	            
-	            //Load Balancer tab	  
-	            if (ipObj.issourcenat == true) {	                
-	                var lbServiceObj = ipFindNetworkServiceByName("Lb", networkObj);
-	                if(lbServiceObj != null) {
-	                    var LoadBalancingSupportedIpsCapabilityObj = ipFindCapabilityByName("LoadBalancingSupportedIps", lbServiceObj);
-	                    if(LoadBalancingSupportedIpsCapabilityObj != null)
-	                        $("#tab_load_balancer").hide();	
-	                    else
-	                        $("#tab_load_balancer").show();	  
-	                }
-	                else {
-	                    $("#tab_load_balancer").hide();	
-	                }	                
-	            }
-	            else { 
-	                if(networkObj != null) {
-	                    var lbServiceObj = ipFindNetworkServiceByName("Lb", networkObj);			    	                      
-	                    if(lbServiceObj != null)
-	                        $("#tab_load_balancer").show();
-	                    else
-	                        $("#tab_load_balancer").hide();	     
-	                }     
-	                else {
-	                    $("#tab_load_balancer").hide();	   
-	                }  
-	            }     	            
-		        
-		        //VPN tab		        
-		        if (ipObj.issourcenat == true) {
-		            var vpnServiceObj = ipFindNetworkServiceByName("Vpn", networkObj);	      
-		            if(vpnServiceObj != null)
-			            $("#tab_vpn").show();
-			        else
-			            $("#tab_vpn").hide();
+        if(ipObj.forvirtualnetwork == true) {  // Public network            
+            if(isIpManageable(ipObj.domainid, ipObj.account) == true) { // IP is managable     
+            	if(g_firewallRuleUiEnabled == "true")
+            	    $("#tab_firewall").show();
+            	else
+            		$("#tab_firewall").hide();
+	            //Port Forwarding tab
+	            if(networkObj != null) {
+	                var firewallServiceObj = ipFindNetworkServiceByName("Firewall", networkObj);
+	                if(firewallServiceObj != null) {
+			            var portForwardingCapabilityObj = ipFindCapabilityByName("PortForwarding", firewallServiceObj);
+			            if(portForwardingCapabilityObj != null) {
+			                if(portForwardingCapabilityObj.value == "true") 
+			                    $("#tab_port_forwarding").show();  			                
+			                else
+			                    $("#tab_port_forwarding").hide();    
+			            }
+			            else {
+			                $("#tab_port_forwarding").hide();    
+			            }	
+	                }
+	                else {
+	                    $("#tab_port_forwarding").hide();    
+	                }
+	            }
+	            else {
+	                $("#tab_port_forwarding").hide();    
+	            }
+	            
+	            //Load Balancer tab	  
+	            if (ipObj.issourcenat == true) {	                
+	                var lbServiceObj = ipFindNetworkServiceByName("Lb", networkObj);
+	                if(lbServiceObj != null) {
+	                    var LoadBalancingSupportedIpsCapabilityObj = ipFindCapabilityByName("LoadBalancingSupportedIps", lbServiceObj);
+	                    if(LoadBalancingSupportedIpsCapabilityObj != null)
+	                        $("#tab_load_balancer").hide();	
+	                    else
+	                        $("#tab_load_balancer").show();	  
+	                }
+	                else {
+	                    $("#tab_load_balancer").hide();	
+	                }	                
+	            }
+	            else { 
+	                if(networkObj != null) {
+	                    var lbServiceObj = ipFindNetworkServiceByName("Lb", networkObj);			    	                      
+	                    if(lbServiceObj != null)
+	                        $("#tab_load_balancer").show();
+	                    else
+	                        $("#tab_load_balancer").hide();	     
+	                }     
+	                else {
+	                    $("#tab_load_balancer").hide();	   
+	                }  
+	            }     	            
+		        
+		        //VPN tab		        
+		        if (ipObj.issourcenat == true) {
+		            var vpnServiceObj = ipFindNetworkServiceByName("Vpn", networkObj);	      
+		            if(vpnServiceObj != null)
+			            $("#tab_vpn").show();
+			        else
+			            $("#tab_vpn").hide();
 		        }   
 		        else {
 		            $("#tab_vpn").hide();
 		        }          
             } 
-            else { 
-	            $("#tab_port_forwarding, #tab_load_balancer, #tab_vpn").hide();	    
+            else { // IP is not managable              	
+	            $("#tab_firewall, #tab_port_forwarding, #tab_load_balancer, #tab_vpn").hide();	    
             }
         }
-        else { //ipObj.forvirtualnetwork == false (direct network)
-            $("#tab_port_forwarding, #tab_load_balancer, #tab_vpn").hide();	    
+        else { // Direct Network (ipObj.forvirtualnetwork == false)
+            $("#tab_firewall, #tab_port_forwarding, #tab_load_balancer, #tab_vpn").hide();	    
         }            
     }        
 }
 
-function ipJsonToPortRangeTab() {   
+function ipJsonToFirewallTab() {   
+    var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
+   
+    if($midmenuItem1 == null) {
+        ipClearFirewallTab();
+        return;    
+    }
+        
+    var ipObj = $midmenuItem1.data("jsonObj");
+    if(ipObj == null) {
+        ipClearFirewallTab();
+        return;   
+    }
+    
+    var $thisTab = $("#right_panel_content #tab_content_firewall");  
+	$thisTab.find("#tab_container").hide(); 
+    $thisTab.find("#tab_spinning_wheel").show();   		
+    
+    var networkObj = $midmenuItem1.data("networkObj");   
+    if(networkObj != null) {
+        var firewallServiceObj = ipFindNetworkServiceByName("Firewall", networkObj);
+        if(firewallServiceObj != null) {
+	        var supportedProtocolsCapabilityObj = ipFindCapabilityByName("SupportedProtocols", firewallServiceObj);    
+            if(supportedProtocolsCapabilityObj != null) {
+                var protocols = supportedProtocolsCapabilityObj.value.toUpperCase();  //e.g. "tcp,udp" => "TCP,UDP"         
+                var array1 = protocols.split(",");
+                var $protocolField = $("#create_firewall_row").find("#protocol").empty();
+                for(var i=0; i<array1.length; i++) {
+                	$protocolField.append("<option value='"+array1[i]+"'>"+array1[i]+"</option>")
+                }
+            }  
+        }
+    }  
+ 
+    refreshCreateFirewallRow();         
+           		
+    $.ajax({
+        data: createURL("command=listFirewallRules&ipaddressid=" + ipObj.id),
+        dataType: "json",        
+        success: function(json) {	    
+            var items = json.listfirewallrulesresponse.firewallrule;              
+            var $grid = $thisTab.find("#grid_content").empty();                       		    		      	    		
+            if (items != null && items.length > 0) {				        			        
+                for (var i = 0; i < items.length; i++) {
+	                var $template = $("#firewall_template").clone(true);
+	                firewallJsonToTemplate(items[i], $template); 
+	                $grid.append($template.show());						   
+                }			    
+            } 	
+            $thisTab.find("#tab_spinning_wheel").hide();    
+            $thisTab.find("#tab_container").show();           	      		    						
+        }
+    });      
+}
+
+function ipJsonToPortRangeTab() {   
     var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
    
     if($midmenuItem1 == null) {
@@ -612,21 +1006,23 @@ function ipJsonToPortRangeTab() {
         return;   
     }
     
-    var $thisTab = $("#right_panel_content #tab_content_port_range");  
+    var $thisTab = $("#right_panel_content #tab_content_port_range");  
 	$thisTab.find("#tab_container").hide(); 
     $thisTab.find("#tab_spinning_wheel").show();   		
     
     var networkObj = $midmenuItem1.data("networkObj");  
     if(networkObj != null) {
-        var firewallServiceObj = ipFindNetworkServiceByName("Firewall", networkObj);
-        if(firewallServiceObj != null) {
+        var firewallServiceObj = ipFindNetworkServiceByName("Firewall", networkObj);
+        if(firewallServiceObj != null) {
 	        var supportedProtocolsCapabilityObj = ipFindCapabilityByName("SupportedProtocols", firewallServiceObj);    
             if(supportedProtocolsCapabilityObj != null) {
                 var protocols = supportedProtocolsCapabilityObj.value.toUpperCase();  //e.g. "tcp,udp" => "TCP,UDP"         
                 var array1 = protocols.split(",");
                 var $protocolField = $("#create_port_range_row").find("#protocol").empty();
-                for(var i=0; i<array1.length; i++)
-                    $protocolField.append("<option value='"+array1[i]+"'>"+array1[i]+"</option>")
+                for(var i=0; i<array1.length; i++) {
+                	if(array1[i] != "ICMP")
+                        $protocolField.append("<option value='"+array1[i]+"'>"+array1[i]+"</option>")
+                }
             }  
         }
     }  
@@ -653,7 +1049,7 @@ function ipJsonToPortRangeTab() {
     });      
 }
 
-function ipJsonToPortForwardingTab() {   
+function ipJsonToPortForwardingTab() {   
     var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
     if($midmenuItem1 == null) {
         ipClearPortForwardingTab();
@@ -666,21 +1062,23 @@ function ipJsonToPortForwardingTab() {
         return;   
     }           
     
-    var $thisTab = $("#right_panel_content #tab_content_port_forwarding");  
+    var $thisTab = $("#right_panel_content #tab_content_port_forwarding");  
 	$thisTab.find("#tab_container").hide(); 
     $thisTab.find("#tab_spinning_wheel").show();   		
 
     var networkObj = $midmenuItem1.data("networkObj");
     if(networkObj != null) {
-        var firewallServiceObj = ipFindNetworkServiceByName("Firewall", networkObj);
-        if(firewallServiceObj != null) {
+        var firewallServiceObj = ipFindNetworkServiceByName("Firewall", networkObj);
+        if(firewallServiceObj != null) {
 	        var supportedProtocolsCapabilityObj = ipFindCapabilityByName("SupportedProtocols", firewallServiceObj);    
             if(supportedProtocolsCapabilityObj != null) {
                 var protocols = supportedProtocolsCapabilityObj.value.toUpperCase();  //e.g. "tcp,udp" => "TCP,UDP"         
                 var array1 = protocols.split(",");
                 var $protocolField = $("#create_port_forwarding_row").find("#protocol").empty();
-                for(var i=0; i<array1.length; i++)
-                    $protocolField.append("<option value='"+array1[i]+"'>"+array1[i]+"</option>")
+                for(var i=0; i<array1.length; i++) {
+                	if(array1[i] != "ICMP")
+                        $protocolField.append("<option value='"+array1[i]+"'>"+array1[i]+"</option>")
+                }
             }  
         }
     }  
@@ -719,29 +1117,29 @@ function ipJsonToLoadBalancerTab() {
         ipClearLoadBalancerTab();
         return;
     }
-       
-    var $thisTab = $("#right_panel_content #tab_content_load_balancer");  
+       
+    var $thisTab = $("#right_panel_content #tab_content_load_balancer");  
 	$thisTab.find("#tab_container").hide(); 
-    $thisTab.find("#tab_spinning_wheel").show();   
-	
-	var networkObj = $midmenuItem1.data("networkObj");   	
-    if(networkObj != null) {		
-	    var lbServiceObj = ipFindNetworkServiceByName("Lb", networkObj);
-	    if(lbServiceObj != null) {
-	        var supportedLbAlgorithmsCapabilityObj = ipFindCapabilityByName("SupportedLbAlgorithms", lbServiceObj);		
-	        if(supportedLbAlgorithmsCapabilityObj != null) {
-               var algorithms = supportedLbAlgorithmsCapabilityObj.value;  //e.g. "roundrobin,leastconn,sourceip"        
-               var array1 = algorithms.split(",");
-               var $algorithmField1 = $("#create_load_balancer_row").find("#algorithm_select").empty();
-               var $algorithmField2 = $("#load_balancer_template").find("#row_container_edit").find("#algorithm_select").empty();
-               for(var i=0; i<array1.length; i++) {
-                   $algorithmField1.append("<option value='"+array1[i]+"'>"+array1[i]+"</option>");
-                   $algorithmField2.append("<option value='"+array1[i]+"'>"+array1[i]+"</option>");
-               }
-            }  	
-        }
-    }
-        
+    $thisTab.find("#tab_spinning_wheel").show();   
+    
+	var networkObj = $midmenuItem1.data("networkObj");   	
+    if(networkObj != null) {		
+	    var lbServiceObj = ipFindNetworkServiceByName("Lb", networkObj);
+	    if(lbServiceObj != null) {
+	        var supportedLbAlgorithmsCapabilityObj = ipFindCapabilityByName("SupportedLbAlgorithms", lbServiceObj);		
+	        if(supportedLbAlgorithmsCapabilityObj != null) {
+               var algorithms = supportedLbAlgorithmsCapabilityObj.value;  //e.g. "roundrobin,leastconn,sourceip"        
+               var array1 = algorithms.split(",");
+               var $algorithmField1 = $("#create_load_balancer_row").find("#algorithm_select").empty();
+               var $algorithmField2 = $("#load_balancer_template").find("#row_container_edit").find("#algorithm_select").empty();
+               for(var i=0; i<array1.length; i++) {
+                   $algorithmField1.append("<option value='"+array1[i]+"'>"+array1[i]+"</option>");
+                   $algorithmField2.append("<option value='"+array1[i]+"'>"+array1[i]+"</option>");
+               }
+            }  	
+        }
+    }
+        
     refreshCreateLoadBalancerRow();            
         
     $.ajax({
@@ -762,81 +1160,89 @@ function ipJsonToLoadBalancerTab() {
             $thisTab.find("#tab_container").show();    	       	      		    						
         }
     });    
-}
-
-function showEnableVPNDialog($thisTab) {
-	$("#dialog_enable_vpn")	
-	.dialog('option', 'buttons', { 						
-		"Enable": function() { 
-			var $thisDialog = $(this);
-			$thisDialog.find("#info_container").hide(); 
-			$spinningWheel = $thisDialog.find("#spinning_wheel").show();
-			
-			var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");	
-			var ipObj = $midmenuItem1.data("jsonObj");
-						
-			$.ajax({
-				data: createURL("command=createRemoteAccessVpn&publicipid="+ipObj.id+"&account="+ipObj.account+"&domainid="+ipObj.domainid+"&zoneid="+ipObj.zoneid),
-				dataType: "json",
-				success: function(json) {
-					var jobId = json.createremoteaccessvpnresponse.jobid;
-					var timerKey = "asyncJob_" + jobId;					                       
-					$("body").everyTime(
-						5000,
-						timerKey,
-						function() {
-							$.ajax({
-								data: createURL("command=queryAsyncJobResult&jobId="+jobId),
-								dataType: "json",									                    					                    
-								success: function(json) {		                                                     							                       
-									var result = json.queryasyncjobresultresponse;										                   
-									if (result.jobstatus == 0) {
-										return; //Job has not completed
-									} else {											                    
-										$("body").stopTime(timerKey);				                        
-										$spinningWheel.hide(); 																							 
-										if (result.jobstatus == 1) { // Succeeded
-											showVpnUsers(result.jobresult.remoteaccessvpn.presharedkey, result.jobresult.remoteaccessvpn.publicip);
-											$thisDialog.dialog("close");											
-											$thisTab.find("#tab_container").show();
-											$thisTab.find("#vpn_disabled_msg").hide();
-										} else if (result.jobstatus == 2) { // Failed	
-											//var errorMsg = "We were unable to enable VPN access.  Please contact support.";
-											 var errorMsg = g_dictionary["label.failed"] + " - " + fromdb(result.jobresult.errortext);	
-											$thisDialog.find("#info_container").text(errorMsg).show();
-										}	
-									}
-								},
-								error: function(XMLHttpResponse) {	                            
-									$("body").stopTime(timerKey);	
-									handleError(XMLHttpResponse, function() {
-										handleErrorInDialog(XMLHttpResponse, $thisDialog); 	
-									});
-								}
-							});
-						},
-						0
-					);
-				},
-				error: function(XMLHttpResponse) {
-					handleError(XMLHttpResponse, function() {
-						handleErrorInDialog(XMLHttpResponse, $thisDialog);	
-					});
-				}
-			});    
-		}, 
-		"Cancel": function() { 
-			$thisTab.find("#tab_container").hide();
-			$thisTab.find("#vpn_disabled_msg").show();
-			$(this).dialog("close"); 
-			$thisTab.find("#enable_vpn_link").unbind("click").bind("click", function(event) {
-				showEnableVPNDialog($thisTab);
-			});
-		} 
-	}).dialog("open");
-}
-
-function ipJsonToVPNTab() {
+}
+
+function showEnableVPNDialog($thisTab) {
+	$("#dialog_enable_vpn")	
+	.dialog('option', 'buttons', { 						
+		"Enable": function() { 
+			var $thisDialog = $(this);
+			$thisDialog.find("#info_container").hide(); 
+			$spinningWheel = $thisDialog.find("#spinning_wheel").show();
+			
+			var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");	
+			var ipObj = $midmenuItem1.data("jsonObj");
+			
+			var array1 = [];			
+			array1.push("&publicipid="+ipObj.id);
+			array1.push("&account="+ipObj.account);
+			array1.push("&domainid="+ipObj.domainid);
+			array1.push("&zoneid="+ipObj.zoneid);	
+			if(g_firewallRuleUiEnabled == "true")
+		        array1.push("&openfirewall=true");
+			
+			$.ajax({
+				data: createURL("command=createRemoteAccessVpn"+array1.join("")),
+				dataType: "json",
+				success: function(json) {
+					var jobId = json.createremoteaccessvpnresponse.jobid;
+					var timerKey = "asyncJob_" + jobId;					                       
+					$("body").everyTime(
+						5000,
+						timerKey,
+						function() {
+							$.ajax({
+								data: createURL("command=queryAsyncJobResult&jobId="+jobId),
+								dataType: "json",									                    					                    
+								success: function(json) {		                                                     							                       
+									var result = json.queryasyncjobresultresponse;										                   
+									if (result.jobstatus == 0) {
+										return; //Job has not completed
+									} else {											                    
+										$("body").stopTime(timerKey);				                        
+										$spinningWheel.hide(); 																							 
+										if (result.jobstatus == 1) { // Succeeded
+											showVpnUsers(result.jobresult.remoteaccessvpn.presharedkey, result.jobresult.remoteaccessvpn.publicip);
+											$thisDialog.dialog("close");											
+											$thisTab.find("#tab_container").show();
+											$thisTab.find("#vpn_disabled_msg").hide();
+										} else if (result.jobstatus == 2) { // Failed	
+											//var errorMsg = "We were unable to enable VPN access.  Please contact support.";
+											 var errorMsg = g_dictionary["label.failed"] + " - " + fromdb(result.jobresult.errortext);	
+											$thisDialog.find("#info_container").text(errorMsg).show();
+										}	
+									}
+								},
+								error: function(XMLHttpResponse) {	                            
+									$("body").stopTime(timerKey);	
+									handleError(XMLHttpResponse, function() {
+										handleErrorInDialog(XMLHttpResponse, $thisDialog); 	
+									});
+								}
+							});
+						},
+						0
+					);
+				},
+				error: function(XMLHttpResponse) {
+					handleError(XMLHttpResponse, function() {
+						handleErrorInDialog(XMLHttpResponse, $thisDialog);	
+					});
+				}
+			});    
+		}, 
+		"Cancel": function() { 
+			$thisTab.find("#tab_container").hide();
+			$thisTab.find("#vpn_disabled_msg").show();
+			$(this).dialog("close"); 
+			$thisTab.find("#enable_vpn_link").unbind("click").bind("click", function(event) {
+				showEnableVPNDialog($thisTab);
+			});
+		} 
+	}).dialog("open");
+}
+
+function ipJsonToVPNTab() {
     var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
     if($midmenuItem1 == null) {
         ipClearVPNTab();
@@ -846,321 +1252,321 @@ function ipJsonToVPNTab() {
     var ipObj = $midmenuItem1.data("jsonObj");
     if(ipObj == null) {
         ipClearVPNTab();
-        return;
-    }
-		
-	var $thisTab = $("#right_panel_content").find("#tab_content_vpn");  	
-	$thisTab.find("#tab_spinning_wheel").show();    
-    $thisTab.find("#tab_container").hide();   
-		
-	$.ajax({
-        data: createURL("command=listRemoteAccessVpns&publicipid="+ipObj.id),
-        dataType: "json",
-        success: function(json) {		                    
-            var items = json.listremoteaccessvpnsresponse.remoteaccessvpn;  
-            if (items != null && items.length > 0) {
-				showVpnUsers(items[0].presharedkey, items[0].publicip);
-            } else {
-				showEnableVPNDialog($thisTab);
-			}
-            $thisTab.find("#tab_spinning_wheel").hide();    
-            $thisTab.find("#tab_container").show();    	
-			$thisTab.find("#vpn_disabled_msg").hide();
-        }
-    });    
-}
-
-function ipClearVPNTab() {
-	var $thisTab = $("#right_panel_content").find("#tab_content_vpn");  	
-	showEnableVPNDialog($thisTab);	 	
-	$thisTab.find("#vpn_disabled_msg").hide();
-}
-
-function showVpnUsers(presharedkey, publicip) {
-	var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");	
-	var ipObj = $midmenuItem1.data("jsonObj");
-	var $vpnTab = $("#right_panel_content #tab_content_vpn");
-	var $actionMenu = $vpnTab.find("#vpn_action_menu");
-    $actionMenu.find("#action_list").empty();
-	
-	$vpnTab.find("#vpn_key").text(presharedkey);
-	$vpnTab.find("#vpn_ip").text(publicip);
-	
-	var $listItemTemplate = $("#action_list_item");
-	var $listItem = $listItemTemplate.clone();
-	$listItem.find("#link").text("Disable VPN");
-	$listItem.bind("click", function(event) {
-		$actionMenu.hide();  
-		$("#dialog_disable_vpn")	
-		.dialog('option', 'buttons', { 						
-			"Disable": function() { 
-				var $thisDialog = $(this);
-				$thisDialog.find("#info_container").hide(); 
-				$spinningWheel = $thisDialog.find("#spinning_wheel").show();
-				$.ajax({
-					data: createURL("command=deleteRemoteAccessVpn&publicipid="+ipObj.id+"&account="+ipObj.account+"&domainid="+ipObj.domainid+"&zoneid="+ipObj.zoneid),
-					dataType: "json",
-					success: function(json) {
-						var jobId = json.deleteremoteaccessvpnresponse.jobid;
-						var timerKey = "asyncJob_" + jobId;					                       
-						$("body").everyTime(
-							5000,
-							timerKey,
-							function() {
-								$.ajax({
-									data: createURL("command=queryAsyncJobResult&jobId="+jobId),
-									dataType: "json",									                    					                    
-									success: function(json) {		                                                     							                       
-										var result = json.queryasyncjobresultresponse;										                   
-										if (result.jobstatus == 0) {
-											return; //Job has not completed
-										} else {											                    
-											$("body").stopTime(timerKey);				                        
-											$spinningWheel.hide(); 
-																																		 
-											if (result.jobstatus == 1) { // Succeeded 	
-												$thisDialog.dialog("close");
-												$vpnTab.find("#vpn_help").hide();
-												$vpnTab.find("#enable_vpn_link").unbind("click").bind("click", function(event) {
-													showEnableVPNDialog($vpnTab);
-												});
-												$vpnTab.find("#tab_container").hide();
-												$vpnTab.find("#vpn_disabled_msg").show();
-											} else if (result.jobstatus == 2) { // Failed	
-												//var errorMsg = "We were unable to disable VPN access.  Please contact support.";
-												 var errorMsg = g_dictionary["label.failed"] + " - " + fromdb(result.jobresult.errortext);	
-												$thisDialog.find("#info_container").text(errorMsg).show();
-											}	
-										}
-									},
-									error: function(XMLHttpResponse) {	                            
-										$("body").stopTime(timerKey);
-										handleError(XMLHttpResponse, function() {										
-											handleErrorInDialog(XMLHttpResponse, $thisDialog); 		
-										});
-									}
-								});
-							},
-							0
-						);
-					},
-					error: function(XMLHttpResponse) {
-						handleError(XMLHttpResponse, function() {
-							handleErrorInDialog(XMLHttpResponse, $thisDialog);	
-						});
-					}
-				});    
-			}, 
-			"Cancel": function() { 
-				$(this).dialog("close"); 
-			} 
-		}).dialog("open");
-		return false;
-	});
-	$actionMenu.find("#action_list").append($listItem.show()); 
-	
-	$listItem = $listItemTemplate.clone();
-	$listItem.find("#link").text("Add VPN User");
-	$listItem.bind("click", function(event) {
-		$actionMenu.hide();
-		$vpnDialog = $("#dialog_add_vpnuser");
-		$vpnDialog.find("#username").val("");
-		$vpnDialog.find("#password").val("");
-		$("#dialog_add_vpnuser")	
-		.dialog('option', 'buttons', { 						
-			"Add": function() { 
-				var $thisDialog = $(this);
-				$thisDialog.find("#info_container").hide();
-				
-				var isValid = true;		
-				isValid &= validateString("Username", $thisDialog.find("#username"), $thisDialog.find("#username_errormsg"));					    
-				isValid &= validateString("Password", $thisDialog.find("#password"), $thisDialog.find("#password_errormsg"));				
-				if (!isValid) return;	
-				
-				var username = todb($thisDialog.find("#username").val());
-				var password = todb($thisDialog.find("#password").val());
-				
-				$spinningWheel = $thisDialog.find("#spinning_wheel").show();
-				$.ajax({
-					data: createURL("command=addVpnUser&username="+username+"&password="+password),
-					dataType: "json",
-					success: function(json) {
-						var jobId = json.addvpnuserresponse.jobid;
-						var timerKey = "asyncJob_" + jobId;					                       
-						$("body").everyTime(
-							5000,
-							timerKey,
-							function() {
-								$.ajax({
-									data: createURL("command=queryAsyncJobResult&jobId="+jobId),
-									dataType: "json",									                    					                    
-									success: function(json) {		                                                     							                       
-										var result = json.queryasyncjobresultresponse;										                   
-										if (result.jobstatus == 0) {
-											return; //Job has not completed
-										} else {											                    
-											$("body").stopTime(timerKey);				                        
-											$spinningWheel.hide(); 
-																																		 
-											if (result.jobstatus == 1) { // Succeeded 	
-												$thisDialog.dialog("close");
-												$("#tab_content_vpn #grid_content").append(vpnUserJsonToTemplate(result.jobresult.vpnuser).fadeIn());
-											} else if (result.jobstatus == 2) { // Failed	
-												//var errorMsg = "We were unable to add user access to your VPN.  Please contact support.";
-												 var errorMsg = g_dictionary["label.failed"] + " - " + fromdb(result.jobresult.errortext);	
-												$thisDialog.find("#info_container").text(errorMsg).show();
-											}	
-										}
-									},
-									error: function(XMLHttpResponse) {	                            
-										$("body").stopTime(timerKey);	
-										handleError(XMLHttpResponse, function() {
-											handleErrorInDialog(XMLHttpResponse, $thisDialog); 	
-										});
-									}
-								});
-							},
-							0
-						);
-					},
-					error: function(XMLHttpResponse) {
-						handleError(XMLHttpResponse, function() {
-							handleErrorInDialog(XMLHttpResponse, $thisDialog);	
-						});
-					}
-				});    
-			}, 
-			"Cancel": function() { 
-				$(this).dialog("close"); 
-			} 
-		}).dialog("open");
-		return false;
-	});
-	$actionMenu.find("#action_list").append($listItem.show()); 
-	
-	// Enable action menu for vpn
-	var $actionLink = $vpnTab.find("#vpn_action_link");		
-	$actionLink.unbind("mouseover").bind("mouseover", function(event) {
-		$(this).find("#vpn_action_menu").show();    
-		return false;
-	});
-	$actionLink.unbind("mouseout").bind("mouseout", function(event) {
-		$(this).find("#vpn_action_menu").hide();    
-		return false;
-	});		
-	
-	$vpnTab.find("#vpn_help").show();
-	enableDeleteUser();
-	// List users
-	$.ajax({
-        data: createURL("command=listVpnUsers&account="+ipObj.account+"&domainid="+ipObj.domainid),
-        dataType: "json",
-        async: false,
-        success: function(json) {  
-            var items = json.listvpnusersresponse.vpnuser;
-            if(items != null && items.length > 0) {
-				var $gridContent = $("#tab_content_vpn #grid_content").empty();
-				for (var i = 0; i < items.length; i++) {
-					$gridContent.append(vpnUserJsonToTemplate(items[i]).show());
-				}
-				
-				//Enable delete user
-				
-			}
-        }
-    });  
-}
-
-function enableDeleteUser() {
-	$("#tab_content_vpn #grid_content").unbind("click").bind("click", function(event) {
-		var target = $(event.target);
-		var targetId = target.attr("id");
-		if (targetId == "vpn_delete_user") {
-			var id = target.data("id");
-			var username = target.data("username");
-			var account = target.data("account");
-			var domainId = target.data("domainid");
-			var params = [];
-			params.push("&username="+username);
-			params.push("&account="+account);
-			params.push("&domainid="+domainId);
-			var $thisDialog = $("#dialog_confirmation_remove_vpnuser");
-			$thisDialog.find("#username").text(target.data("username"));
-			$thisDialog.dialog('option', 'buttons', { 						
-				"Ok": function() { 
-				    $thisDialog.find("#info_container").hide(); 
-					$spinningWheel = $thisDialog.find("#spinning_wheel").show();
-					$.ajax({
-						data: createURL("command=removeVpnUser"+params.join("")),
-						dataType: "json",
-						success: function(json) {
-							var jobId = json.removevpnuserresponse.jobid;
-							var timerKey = "asyncJob_" + jobId;					                       
-							$("body").everyTime(
-								5000,
-								timerKey,
-								function() {
-									$.ajax({
-										data: createURL("command=queryAsyncJobResult&jobId="+jobId),
-										dataType: "json",									                    					                    
-										success: function(json) {		                                                     							                       
-											var result = json.queryasyncjobresultresponse;										                   
-											if (result.jobstatus == 0) {
-												return; //Job has not completed
-											} else {											                    
-												$("body").stopTime(timerKey);				                        
-												$spinningWheel.hide(); 
-																																			 
-												if (result.jobstatus == 1) { // Succeeded 	
-													$thisDialog.dialog("close");
-													
-													//remove user from grid
-													$("#right_panel_content #tab_content_vpn").find("#vpnuser"+id).slideUp();
-												} else if (result.jobstatus == 2) { // Failed	
-													//var errorMsg = "We were unable to add user access to your VPN.  Please contact support.";
-													 var errorMsg = g_dictionary["label.failed"] + " - " + fromdb(result.jobresult.errortext);	
-													$thisDialog.find("#info_container").text(errorMsg).show();
-												}	
-											}
-										},
-										error: function(XMLHttpResponse) {	                            
-											$("body").stopTime(timerKey);
-											handleError(XMLHttpResponse, function() {
-												handleErrorInDialog(XMLHttpResponse, $thisDialog);
-											});
-										}
-									});
-								},
-								0
-							);
-						},
-						error: function(XMLHttpResponse) {
-							handleError(XMLHttpResponse, function() {
-								handleErrorInDialog(XMLHttpResponse, $thisDialog);
-							});
-						}
-					});    
-				}, 
-				"Cancel": function() { 
-					$(this).dialog("close"); 
-				} 
-			}).dialog("open");
-			
-		}
-		return false;
-	});
-}
-
-
-var vpnItem = 1;
-function vpnUserJsonToTemplate(json) {
-	var $template = $("#vpn_template").clone();
-	if (vpnItem++ % 2 == 0) $template.removeClass("odd").addClass("even");
-	$template.find("#username").text(json.username);
-	$template.attr("id", "vpnuser"+json.id);
-	$template.find("#vpn_delete_user").data("id", json.id).data("username", json.username).data("account", json.account).data("domainid", json.domainid);
-	return $template;
-}
+        return;
+    }
+		
+	var $thisTab = $("#right_panel_content").find("#tab_content_vpn");  	
+	$thisTab.find("#tab_spinning_wheel").show();    
+    $thisTab.find("#tab_container").hide();   
+		
+	$.ajax({
+        data: createURL("command=listRemoteAccessVpns&publicipid="+ipObj.id),
+        dataType: "json",
+        success: function(json) {		                    
+            var items = json.listremoteaccessvpnsresponse.remoteaccessvpn;  
+            if (items != null && items.length > 0) {
+				showVpnUsers(items[0].presharedkey, items[0].publicip);
+            } else {
+				showEnableVPNDialog($thisTab);
+			}
+            $thisTab.find("#tab_spinning_wheel").hide();    
+            $thisTab.find("#tab_container").show();    	
+			$thisTab.find("#vpn_disabled_msg").hide();
+        }
+    });    
+}
+
+function ipClearVPNTab() {
+	var $thisTab = $("#right_panel_content").find("#tab_content_vpn");  	
+	showEnableVPNDialog($thisTab);	 	
+	$thisTab.find("#vpn_disabled_msg").hide();
+}
+
+function showVpnUsers(presharedkey, publicip) {
+	var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");	
+	var ipObj = $midmenuItem1.data("jsonObj");
+	var $vpnTab = $("#right_panel_content #tab_content_vpn");
+	var $actionMenu = $vpnTab.find("#vpn_action_menu");
+    $actionMenu.find("#action_list").empty();
+	
+	$vpnTab.find("#vpn_key").text(presharedkey);
+	$vpnTab.find("#vpn_ip").text(publicip);
+	
+	var $listItemTemplate = $("#action_list_item");
+	var $listItem = $listItemTemplate.clone();
+	$listItem.find("#link").text("Disable VPN");
+	$listItem.bind("click", function(event) {
+		$actionMenu.hide();  
+		$("#dialog_disable_vpn")	
+		.dialog('option', 'buttons', { 						
+			"Disable": function() { 
+				var $thisDialog = $(this);
+				$thisDialog.find("#info_container").hide(); 
+				$spinningWheel = $thisDialog.find("#spinning_wheel").show();
+				$.ajax({
+					data: createURL("command=deleteRemoteAccessVpn&publicipid="+ipObj.id+"&account="+ipObj.account+"&domainid="+ipObj.domainid+"&zoneid="+ipObj.zoneid),
+					dataType: "json",
+					success: function(json) {
+						var jobId = json.deleteremoteaccessvpnresponse.jobid;
+						var timerKey = "asyncJob_" + jobId;					                       
+						$("body").everyTime(
+							5000,
+							timerKey,
+							function() {
+								$.ajax({
+									data: createURL("command=queryAsyncJobResult&jobId="+jobId),
+									dataType: "json",									                    					                    
+									success: function(json) {		                                                     							                       
+										var result = json.queryasyncjobresultresponse;										                   
+										if (result.jobstatus == 0) {
+											return; //Job has not completed
+										} else {											                    
+											$("body").stopTime(timerKey);				                        
+											$spinningWheel.hide(); 
+																																		 
+											if (result.jobstatus == 1) { // Succeeded 	
+												$thisDialog.dialog("close");
+												$vpnTab.find("#vpn_help").hide();
+												$vpnTab.find("#enable_vpn_link").unbind("click").bind("click", function(event) {
+													showEnableVPNDialog($vpnTab);
+												});
+												$vpnTab.find("#tab_container").hide();
+												$vpnTab.find("#vpn_disabled_msg").show();
+											} else if (result.jobstatus == 2) { // Failed	
+												//var errorMsg = "We were unable to disable VPN access.  Please contact support.";
+												 var errorMsg = g_dictionary["label.failed"] + " - " + fromdb(result.jobresult.errortext);	
+												$thisDialog.find("#info_container").text(errorMsg).show();
+											}	
+										}
+									},
+									error: function(XMLHttpResponse) {	                            
+										$("body").stopTime(timerKey);
+										handleError(XMLHttpResponse, function() {										
+											handleErrorInDialog(XMLHttpResponse, $thisDialog); 		
+										});
+									}
+								});
+							},
+							0
+						);
+					},
+					error: function(XMLHttpResponse) {
+						handleError(XMLHttpResponse, function() {
+							handleErrorInDialog(XMLHttpResponse, $thisDialog);	
+						});
+					}
+				});    
+			}, 
+			"Cancel": function() { 
+				$(this).dialog("close"); 
+			} 
+		}).dialog("open");
+		return false;
+	});
+	$actionMenu.find("#action_list").append($listItem.show()); 
+	
+	$listItem = $listItemTemplate.clone();
+	$listItem.find("#link").text("Add VPN User");
+	$listItem.bind("click", function(event) {
+		$actionMenu.hide();
+		$vpnDialog = $("#dialog_add_vpnuser");
+		$vpnDialog.find("#username").val("");
+		$vpnDialog.find("#password").val("");
+		$("#dialog_add_vpnuser")	
+		.dialog('option', 'buttons', { 						
+			"Add": function() { 
+				var $thisDialog = $(this);
+				$thisDialog.find("#info_container").hide();
+				
+				var isValid = true;		
+				isValid &= validateString("Username", $thisDialog.find("#username"), $thisDialog.find("#username_errormsg"));					    
+				isValid &= validateString("Password", $thisDialog.find("#password"), $thisDialog.find("#password_errormsg"));				
+				if (!isValid) return;	
+				
+				var username = todb($thisDialog.find("#username").val());
+				var password = todb($thisDialog.find("#password").val());
+				
+				$spinningWheel = $thisDialog.find("#spinning_wheel").show();
+				$.ajax({
+					data: createURL("command=addVpnUser&username="+username+"&password="+password),
+					dataType: "json",
+					success: function(json) {
+						var jobId = json.addvpnuserresponse.jobid;
+						var timerKey = "asyncJob_" + jobId;					                       
+						$("body").everyTime(
+							5000,
+							timerKey,
+							function() {
+								$.ajax({
+									data: createURL("command=queryAsyncJobResult&jobId="+jobId),
+									dataType: "json",									                    					                    
+									success: function(json) {		                                                     							                       
+										var result = json.queryasyncjobresultresponse;										                   
+										if (result.jobstatus == 0) {
+											return; //Job has not completed
+										} else {											                    
+											$("body").stopTime(timerKey);				                        
+											$spinningWheel.hide(); 
+																																		 
+											if (result.jobstatus == 1) { // Succeeded 	
+												$thisDialog.dialog("close");
+												$("#tab_content_vpn #grid_content").append(vpnUserJsonToTemplate(result.jobresult.vpnuser).fadeIn());
+											} else if (result.jobstatus == 2) { // Failed	
+												//var errorMsg = "We were unable to add user access to your VPN.  Please contact support.";
+												 var errorMsg = g_dictionary["label.failed"] + " - " + fromdb(result.jobresult.errortext);	
+												$thisDialog.find("#info_container").text(errorMsg).show();
+											}	
+										}
+									},
+									error: function(XMLHttpResponse) {	                            
+										$("body").stopTime(timerKey);	
+										handleError(XMLHttpResponse, function() {
+											handleErrorInDialog(XMLHttpResponse, $thisDialog); 	
+										});
+									}
+								});
+							},
+							0
+						);
+					},
+					error: function(XMLHttpResponse) {
+						handleError(XMLHttpResponse, function() {
+							handleErrorInDialog(XMLHttpResponse, $thisDialog);	
+						});
+					}
+				});    
+			}, 
+			"Cancel": function() { 
+				$(this).dialog("close"); 
+			} 
+		}).dialog("open");
+		return false;
+	});
+	$actionMenu.find("#action_list").append($listItem.show()); 
+	
+	// Enable action menu for vpn
+	var $actionLink = $vpnTab.find("#vpn_action_link");		
+	$actionLink.unbind("mouseover").bind("mouseover", function(event) {
+		$(this).find("#vpn_action_menu").show();    
+		return false;
+	});
+	$actionLink.unbind("mouseout").bind("mouseout", function(event) {
+		$(this).find("#vpn_action_menu").hide();    
+		return false;
+	});		
+	
+	$vpnTab.find("#vpn_help").show();
+	enableDeleteUser();
+	// List users
+	$.ajax({
+        data: createURL("command=listVpnUsers&account="+ipObj.account+"&domainid="+ipObj.domainid),
+        dataType: "json",
+        async: false,
+        success: function(json) {  
+            var items = json.listvpnusersresponse.vpnuser;
+            if(items != null && items.length > 0) {
+				var $gridContent = $("#tab_content_vpn #grid_content").empty();
+				for (var i = 0; i < items.length; i++) {
+					$gridContent.append(vpnUserJsonToTemplate(items[i]).show());
+				}
+				
+				//Enable delete user
+				
+			}
+        }
+    });  
+}
+
+function enableDeleteUser() {
+	$("#tab_content_vpn #grid_content").unbind("click").bind("click", function(event) {
+		var target = $(event.target);
+		var targetId = target.attr("id");
+		if (targetId == "vpn_delete_user") {
+			var id = target.data("id");
+			var username = target.data("username");
+			var account = target.data("account");
+			var domainId = target.data("domainid");
+			var params = [];
+			params.push("&username="+username);
+			params.push("&account="+account);
+			params.push("&domainid="+domainId);
+			var $thisDialog = $("#dialog_confirmation_remove_vpnuser");
+			$thisDialog.find("#username").text(target.data("username"));
+			$thisDialog.dialog('option', 'buttons', { 						
+				"Ok": function() { 
+				    $thisDialog.find("#info_container").hide(); 
+					$spinningWheel = $thisDialog.find("#spinning_wheel").show();
+					$.ajax({
+						data: createURL("command=removeVpnUser"+params.join("")),
+						dataType: "json",
+						success: function(json) {
+							var jobId = json.removevpnuserresponse.jobid;
+							var timerKey = "asyncJob_" + jobId;					                       
+							$("body").everyTime(
+								5000,
+								timerKey,
+								function() {
+									$.ajax({
+										data: createURL("command=queryAsyncJobResult&jobId="+jobId),
+										dataType: "json",									                    					                    
+										success: function(json) {		                                                     							                       
+											var result = json.queryasyncjobresultresponse;										                   
+											if (result.jobstatus == 0) {
+												return; //Job has not completed
+											} else {											                    
+												$("body").stopTime(timerKey);				                        
+												$spinningWheel.hide(); 
+																																			 
+												if (result.jobstatus == 1) { // Succeeded 	
+													$thisDialog.dialog("close");
+													
+													//remove user from grid
+													$("#right_panel_content #tab_content_vpn").find("#vpnuser"+id).slideUp();
+												} else if (result.jobstatus == 2) { // Failed	
+													//var errorMsg = "We were unable to add user access to your VPN.  Please contact support.";
+													 var errorMsg = g_dictionary["label.failed"] + " - " + fromdb(result.jobresult.errortext);	
+													$thisDialog.find("#info_container").text(errorMsg).show();
+												}	
+											}
+										},
+										error: function(XMLHttpResponse) {	                            
+											$("body").stopTime(timerKey);
+											handleError(XMLHttpResponse, function() {
+												handleErrorInDialog(XMLHttpResponse, $thisDialog);
+											});
+										}
+									});
+								},
+								0
+							);
+						},
+						error: function(XMLHttpResponse) {
+							handleError(XMLHttpResponse, function() {
+								handleErrorInDialog(XMLHttpResponse, $thisDialog);
+							});
+						}
+					});    
+				}, 
+				"Cancel": function() { 
+					$(this).dialog("close"); 
+				} 
+			}).dialog("open");
+			
+		}
+		return false;
+	});
+}
+
+
+var vpnItem = 1;
+function vpnUserJsonToTemplate(json) {
+	var $template = $("#vpn_template").clone();
+	if (vpnItem++ % 2 == 0) $template.removeClass("odd").addClass("even");
+	$template.find("#username").text(json.username);
+	$template.attr("id", "vpnuser"+json.id);
+	$template.find("#vpn_delete_user").data("id", json.id).data("username", json.username).data("account", json.account).data("domainid", json.domainid);
+	return $template;
+}
 
 function ipClearRightPanel() { 
     ipClearDetailsTab();   
@@ -1184,14 +1590,26 @@ function ipJsonToDetailsTab() {
     
     var networkObj = $midmenuItem1.data("networkObj");
     
-    var id = ipObj.id;   
+    var publicipid = ipObj.id;   
         
     var $thisTab = $("#right_panel_content").find("#tab_content_details");  
     $thisTab.find("#tab_container").hide(); 
     $thisTab.find("#tab_spinning_wheel").show();   
-         
+    
+    
+    var cmd;
+	if(g_supportELB == "guest") {
+		cmd = "command=listPublicIpAddresses&forvirtualnetwork=false&id="+publicipid;
+	}
+	else if(g_supportELB == "public") {
+		cmd = "command=listPublicIpAddresses&forvirtualnetwork=true&id="+publicipid;
+	}
+	else { //g_supportELB == "false"
+		cmd = "command=listPublicIpAddresses&id="+publicipid;
+	}		
+    
     $.ajax({
-        data: createURL("command=listPublicIpAddresses&id="+id),
+        data: createURL(cmd),
         dataType: "json",
         async: false,
         success: function(json) {  
@@ -1239,26 +1657,26 @@ function ipJsonToDetailsTab() {
         ipPopulateVMDropdown($vmSelect);
      
         if(ipObj.isstaticnat == true) {        
-            buildActionLinkForTab("label.action.disable.static.NAT", ipActionMap, $actionMenu, $midmenuItem1, $thisTab);	
-            buildActionLinkForTab("label.action.release.ip", ipActionMap, $actionMenu, $midmenuItem1, $thisTab);
+            buildActionLinkForTab("label.action.disable.static.NAT", ipActionMap, $actionMenu, $midmenuItem1, $thisTab);	
+            buildActionLinkForTab("label.action.release.ip", ipActionMap, $actionMenu, $midmenuItem1, $thisTab);
 			noAvailableActions = false;
         } else {  
-			if(ipObj.issourcenat != true) {   	
-			    if(networkObj != null) {			    
-			        var firewallServiceObj = ipFindNetworkServiceByName("Firewall", networkObj);
-			        if(firewallServiceObj != null) {
-			            var staticNatCapabilityObj = ipFindCapabilityByName("StaticNat", firewallServiceObj);
-			            if(staticNatCapabilityObj != null) {
-			                if(staticNatCapabilityObj.value == "true")
-				                buildActionLinkForTab("label.action.enable.static.NAT", ipActionMap, $actionMenu, $midmenuItem1, $thisTab);
-				        }
-				    }
-				}    				
-    				    
-				buildActionLinkForTab("label.action.release.ip", ipActionMap, $actionMenu, $midmenuItem1, $thisTab);
-				noAvailableActions = false;
-			}
-        }  
+			if(ipObj.issourcenat != true) {   	
+			    if(networkObj != null) {			    
+			        var firewallServiceObj = ipFindNetworkServiceByName("Firewall", networkObj);
+			        if(firewallServiceObj != null) {
+			            var staticNatCapabilityObj = ipFindCapabilityByName("StaticNat", firewallServiceObj);
+			            if(staticNatCapabilityObj != null) {
+			                if(staticNatCapabilityObj.value == "true")
+				                buildActionLinkForTab("label.action.enable.static.NAT", ipActionMap, $actionMenu, $midmenuItem1, $thisTab);
+				        }
+				    }
+				}    				
+    				    
+				buildActionLinkForTab("label.action.release.ip", ipActionMap, $actionMenu, $midmenuItem1, $thisTab);
+				noAvailableActions = false;
+			}
+        }  
     }
        
     // no available actions 
@@ -1305,27 +1723,24 @@ function setNetworkTypeField(value, $field) {
         $field.text("");
 }
 
-var ipActionMap = {  
-    "label.action.release.ip": {                  
-        isAsyncJob: true,     
-        asyncJobResponse: "disassociateipaddressresponse",   
-        dialogBeforeActionFn : doReleaseIp,
-        inProcessText: "label.action.release.ip.processing",
-        afterActionSeccessFn: function(json, $midmenuItem1, id) {   
-            $midmenuItem1.slideUp("slow", function(){
-                $(this).remove();                    
-                if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) {
-                    clearRightPanel();
-                    ipClearRightPanel();
-                }
-            });  
-            
-        }
-    },
-    "label.action.enable.static.NAT": {                      
-        isAsyncJob: false,        
-        dialogBeforeActionFn: doEnableStaticNAT,
-        inProcessText: "label.action.enable.static.NAT.processing",
+var ipActionMap = {  
+    "label.action.release.ip": {                  
+        isAsyncJob: true,     
+        asyncJobResponse: "disassociateipaddressresponse",   
+        dialogBeforeActionFn : doReleaseIp,
+        inProcessText: "label.action.release.ip.processing",
+        afterActionSeccessFn: function(json, $midmenuItem1, id) {   
+			$midmenuItem1.remove();   
+            if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) {
+                clearRightPanel();
+                ipClearRightPanel();
+            }
+        }
+    },
+    "label.action.enable.static.NAT": {                      
+        isAsyncJob: false,        
+        dialogBeforeActionFn: doEnableStaticNAT,
+        inProcessText: "label.action.enable.static.NAT.processing",
         afterActionSeccessFn: function(json, $midmenuItem1, id) {    
             if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) {   
                  $.ajax({
@@ -1338,15 +1753,15 @@ var ipActionMap = {
                             ipToMidmenu(items[0], $midmenuItem1); 
                         }
                     }
-                });                
-	        }   
-        }        
-    },
-    "label.action.disable.static.NAT": {                      
-        isAsyncJob: true,
-        asyncJobResponse: "disablestaticnatresponse",
-        dialogBeforeActionFn: doDisableStaticNAT,
-        inProcessText: "label.action.disable.static.NAT.processing",
+                });                
+	        }   
+        }        
+    },
+    "label.action.disable.static.NAT": {                      
+        isAsyncJob: true,
+        asyncJobResponse: "disablestaticnatresponse",
+        dialogBeforeActionFn: doDisableStaticNAT,
+        inProcessText: "label.action.disable.static.NAT.processing",
         afterActionSeccessFn: function(json, $midmenuItem1, id) {       
             if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) {  
                 $.ajax({
@@ -1359,11 +1774,11 @@ var ipActionMap = {
                             ipToMidmenu(items[0], $midmenuItem1); 
                         }
                     }
-                });         
-            }      
-        }        
-    }
-}   
+                });         
+            }      
+        }        
+    }
+}   
 
 function doReleaseIp($actionLink, $detailsTab, $midmenuItem1) {      
     var jsonObj = $midmenuItem1.data("jsonObj");
@@ -1428,14 +1843,96 @@ function doDisableStaticNAT($actionLink, $detailsTab, $midmenuItem1) {
 
 function ipSetRuleState(stateValue, $stateField) {
     $stateField.text(stateValue);    
-    if(stateValue == "Active")  //green      
-        $stateField.removeClass("status_red status_gray").addClass("status_green");
-    else if(stateValue == "Deleting") //red
+    if(stateValue == "Active")  //green      
+        $stateField.removeClass("status_red status_gray").addClass("status_green");
+    else if(stateValue == "Deleting") //red
         $stateField.removeClass("status_green status_gray").addClass("status_red");
     else //gray
         $stateField.removeClass("status_red status_green").addClass("status_gray");
 }
 
+//***** Firewall tab (begin) ********************************************************************************************************
+function ipClearFirewallTab() {
+   $("#tab_firewall #grid_content").empty(); 
+    refreshCreateFirewallRow(); 
+}    
+
+function firewallJsonToTemplate(jsonObj, $template) {	     
+    $template.attr("id", "firewall_" + fromdb(jsonObj.id)).data("firewallId", fromdb(jsonObj.id));    	    
+    $template.find("#row_container #cidr").text(fromdb(jsonObj.cidrlist));     
+    $template.find("#row_container #start_port").text(fromdb(jsonObj.startport));        
+    $template.find("#row_container #end_port").text(fromdb(jsonObj.endport));        
+    $template.find("#row_container #protocol").text(fromdb(jsonObj.protocol)); 
+    $template.find("#row_container #ICMP_type").text(fromdb(jsonObj.icmptype));        
+    $template.find("#row_container #ICMP_code").text(fromdb(jsonObj.icmpcode));    
+               
+    $template.find("#delete_link").unbind("click").bind("click", function(event){   		                    
+        var $spinningWheel = $template.find("#row_container").find("#spinning_wheel");		
+        $spinningWheel.find("#description").text(g_dictionary["label.deleting.processing"]);	
+        $spinningWheel.show();   
+             
+        $.ajax({
+            data: createURL("command=deleteFirewallRule&id="+fromdb(jsonObj.id)),
+            dataType: "json",           
+            success: function(json) {	                                  	                        
+                var jobId = json.deletefirewallruleresponse.jobid;                  			                        
+                var timerKey = "asyncJob_" + jobId;					                       
+                $("body").everyTime(
+                    10000,
+                    timerKey,
+                    function() {
+                        $.ajax({
+                            data: createURL("command=queryAsyncJobResult&jobId="+jobId),
+	                        dataType: "json",									                    					                    
+	                        success: function(json) {		                                                     							                       
+		                        var result = json.queryasyncjobresultresponse;										                   
+		                        if (result.jobstatus == 0) {
+			                        return; //Job has not completed
+		                        } else {
+			                        $("body").stopTime(timerKey);
+			                        $spinningWheel.hide();   
+									if (result.jobstatus == 1) { // Succeeded										   
+										$template.slideUp("slow", function() {
+											$(this).remove();													
+										});									
+									} else if (result.jobstatus == 2) { // Failed	
+									     var errorMsg = g_dictionary["label.deleting.failed"] + " - " + fromdb(result.jobresult.errortext);		
+									    $("#dialog_error").text(errorMsg).dialog("open");											
+									}							                    
+		                        }
+	                        },
+	                        error: function(XMLHttpResponse) {	 
+		                        $("body").stopTime(timerKey);
+								$spinningWheel.hide();   
+								handleError(XMLHttpResponse);		         
+	                        }
+                        });
+                    },
+                    0
+                );
+            },
+            error: function(XMLHttpResponse) {				
+				$spinningWheel.hide();   
+				handleError(XMLHttpResponse);				
+            }
+        });    
+                 
+        return false;
+    }); 
+}	  
+
+function refreshCreateFirewallRow() {  
+	var $createFirewallRow = $("#tab_content_firewall").find("#create_firewall_row");    
+	$createFirewallRow.find("#cidr").text("");     
+	$createFirewallRow.find("#start_port").text("");           
+	$createFirewallRow.find("#end_port").text("");    
+	$createFirewallRow.find("#ICMP_type").text("");          
+	$createFirewallRow.find("#ICMP_code").text("");    
+	$createFirewallRow.find("#protocol").click();
+}
+
+//***** Firewall tab (end) **********************************************************************************************************
+
 //***** Port Range tab (begin) ********************************************************************************************************
 function ipClearPortRangeTab() {
    $("#tab_content_port_range #grid_content").empty(); 
@@ -1502,7 +1999,7 @@ function portRangeJsonToTemplate(jsonObj, $template) {
                  
         return false;
     }); 
-}	  
+}	  
 
 function refreshCreatePortRangeRow() {    
     var $createPortRangeRow = $("#create_port_range_row");      
@@ -1520,18 +2017,16 @@ function ipClearPortForwardingTab() {
 
 function portForwardingJsonToTemplate(jsonObj, $template) {				        
     $template.attr("id", "portForwarding_" + fromdb(jsonObj.id)).data("portForwardingId", fromdb(jsonObj.id));	
-    
-    $template.find("#cidr").text(fromdb(jsonObj.cidrlist));
-    
-    var publicPort = fromdb(jsonObj.publicport);
-    if(jsonObj.publicendport != null && jsonObj.publicendport.length > 0)
+       
+    var publicPort = fromdb(jsonObj.publicport);
+    if(jsonObj.publicendport != null && jsonObj.publicendport.length > 0)
     	publicPort += (" - " + fromdb(jsonObj.publicendport));    
-    $template.find("#public_port").text(publicPort);
-                
-    var privatePort = fromdb(jsonObj.privateport);
-    if(jsonObj.privateendport != null && jsonObj.privateendport.length > 0)
-    	privatePort += (" - " + fromdb(jsonObj.privateendport));    
-    $template.find("#private_port").text(privatePort);
+    $template.find("#public_port").text(publicPort);
+                
+    var privatePort = fromdb(jsonObj.privateport);
+    if(jsonObj.privateendport != null && jsonObj.privateendport.length > 0)
+    	privatePort += (" - " + fromdb(jsonObj.privateendport));    
+    $template.find("#private_port").text(privatePort);
     
     $template.find("#protocol").text(fromdb(jsonObj.protocol));
        
@@ -1602,13 +2097,13 @@ function portForwardingJsonToTemplate(jsonObj, $template) {
                  
         return false;
     });    
-}	  
+}	  
 
 function refreshCreatePortForwardingRow() {       
     var $createPortForwardingRow = $("#create_port_forwarding_row");      
-    $createPortForwardingRow.find("#public_port").val("");
+    $createPortForwardingRow.find("#public_port").val("");
     $createPortForwardingRow.find("#public_end_port").val("");
-    $createPortForwardingRow.find("#private_port").val("");
+    $createPortForwardingRow.find("#private_port").val("");
     $createPortForwardingRow.find("#private_end_port").val("");
     
     var $vmSelect = $createPortForwardingRow.find("#vm").empty();		
@@ -1664,10 +2159,7 @@ function ipClearLoadBalancerTab() {
 function loadBalancerJsonToTemplate(jsonObj, $template) {	
     var loadBalancerId = fromdb(jsonObj.id);	    
     $template.attr("id", "loadBalancer_" + loadBalancerId).data("loadBalancerId", loadBalancerId);		    
-       
-    $template.find("#row_container #cidr").text(fromdb(jsonObj.cidrlist));
-    $template.find("#row_container_edit #cidr").text(fromdb(jsonObj.cidrlist));
-        
+         
     $template.find("#row_container #name").text(fromdb(jsonObj.name));
     $template.find("#row_container_edit #name").val(fromdb(jsonObj.name));
     
@@ -1743,10 +2235,23 @@ function loadBalancerJsonToTemplate(jsonObj, $template) {
 								} else {
 									$("body").stopTime(timerKey);
 									$spinningWheel.hide();   
-									if (result.jobstatus == 1) { // Succeeded												
+									if (result.jobstatus == 1) { // Succeeded	
+										var total_lbrules = $("#tab_content_load_balancer").find("#grid_content").find(".grid_rows").length;
 										$template.slideUp("slow", function() {
-											$(this).remove();													
-										});
+											$(this).remove();	
+																						
+											if(g_supportELB == "guest" || g_supportELB == "public") {
+												var count_lb = $("div[id*='loadBalancer_']").length;											
+												if(count_lb == 0) {
+													var params = $("#middle_menu_pagination").data("params");
+											        if(params == null)
+											            return;	 										          	    
+											        listMidMenuItems2(params.commandString, params.getSearchParamsFn, params.jsonResponse1, params.jsonResponse2, params.toMidmenuFn, params.toRightPanelFn, params.getMidmenuIdFn, params.isMultipleSelectionInMidMenu, 1);
+											        if($("div[id*='midmenuItem_']").length == 0)
+											        	$("#tab_content_load_balancer").hide();
+												}
+											}											
+										});	
 									} else if (result.jobstatus == 2) { // Failed										
 										var errorMsg = g_dictionary["label.deleting.failed"] + " - " + fromdb(result.jobresult.errortext);	
 										$("#dialog_error").text(errorMsg).dialog("open");
@@ -1920,8 +2425,7 @@ function loadBalancerJsonToTemplate(jsonObj, $template) {
 }	
 
 function refreshCreateLoadBalancerRow() {
-    var createLoadBalancerRow = $("#tab_content_load_balancer #create_load_balancer_row");
-    createLoadBalancerRow.find("#cidr").val("");  
+    var createLoadBalancerRow = $("#tab_content_load_balancer #create_load_balancer_row");   
     createLoadBalancerRow.find("#name").val("");  
     createLoadBalancerRow.find("#public_port").val("");
     createLoadBalancerRow.find("#private_port").val("");
diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js
index a0f7371dd0d..2003ad404ae 100644
--- a/ui/scripts/cloud.core.js
+++ b/ui/scripts/cloud.core.js
@@ -1318,7 +1318,7 @@ function listMidMenuItems(commandString, getSearchParamsFn, jsonResponse1, jsonR
 }
 
 function bindAndListMidMenuItems($leftmenu, commandString, getSearchParamsFn, jsonResponse1, jsonResponse2, rightPanelJSP, afterLoadRightPanelJSPFn, toMidmenuFn, toRightPanelFn, getMidmenuIdFn, isMultipleSelectionInMidMenu) {	
-	$leftmenu.bind("click", function(event) {
+	$leftmenu.unbind().bind("click", function(event) {
 		selectLeftSubMenu($(this));		
         listMidMenuItems(commandString, getSearchParamsFn, jsonResponse1, jsonResponse2, rightPanelJSP, afterLoadRightPanelJSPFn, toMidmenuFn, toRightPanelFn, getMidmenuIdFn, isMultipleSelectionInMidMenu, $(this).attr("id"), null);
         return false;
@@ -1526,12 +1526,14 @@ var g_domainid = null;
 var g_enableLogging = false; 
 var g_timezoneoffset = null;
 var g_timezone = null;
+var g_supportELB = null;
+var g_firewallRuleUiEnabled = null; //true or false
 
 // capabilities
 var g_directAttachSecurityGroupsEnabled = "false";
 function getDirectAttachSecurityGroupsEnabled() { return g_directAttachSecurityGroupsEnabled; }
 
-var g_userPublicTemplateEnabled = "true"
+var g_userPublicTemplateEnabled = "true";
 function getUserPublicTemplateEnabled() { return g_userPublicTemplateEnabled; }
 
 //keyboard keycode
diff --git a/ui/scripts/cloud.core.network.js b/ui/scripts/cloud.core.network.js
index cb607b2d41a..5ff507ba9fa 100644
--- a/ui/scripts/cloud.core.network.js
+++ b/ui/scripts/cloud.core.network.js
@@ -1519,13 +1519,11 @@ var directNetworkActionMap = {
         dialogBeforeActionFn : doDeleteDirectNetwork,        
         inProcessText: "label.action.delete.network.processing",
         afterActionSeccessFn: function(json, $midmenuItem1, id) {   
-            $midmenuItem1.slideUp("slow", function() {
-                $(this).remove();                
-                if(id.toString() == $("#right_panel_content").find("#direct_network_page").find("#tab_content_details").find("#id").text()) {
-                    clearRightPanel();
-                    directNetworkClearRightPanel();
-                }                
-            });              
+            $midmenuItem1.remove();                             
+            if(id.toString() == $("#right_panel_content").find("#direct_network_page").find("#tab_content_details").find("#id").text()) {
+                clearRightPanel();
+                directNetworkClearRightPanel();
+            }           
         }
     }    
 }  
diff --git a/ui/scripts/cloud.core.pod.js b/ui/scripts/cloud.core.pod.js
index caa06b43833..ebcf7a54f08 100644
--- a/ui/scripts/cloud.core.pod.js
+++ b/ui/scripts/cloud.core.pod.js
@@ -350,6 +350,8 @@ function podClearDetailsTab() {
     
     $thisTab.find("#gateway").text(""); 
     $thisTab.find("#gateway_edit").val(""); 
+    
+    $thisTab.find("#allocationstate").text(""); 
 }
 	
 function getIpRange(startip, endip) {
@@ -1159,13 +1161,11 @@ var podActionMap = {
         dialogBeforeActionFn : doDeletePod,        
         inProcessText: "label.action.delete.pod.processing",
         afterActionSeccessFn: function(json, $midmenuItem1, id) {       
-            $midmenuItem1.slideUp("slow", function() {
-                $(this).remove();                
-                if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) {
-                    clearRightPanel();
-                    podClearRightPanel();
-                }                
-            });           
+            $midmenuItem1.remove();                             
+            if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) {
+                clearRightPanel();
+                podClearRightPanel();
+            }       
         }
     }
 }
diff --git a/ui/scripts/cloud.core.primarystorage.js b/ui/scripts/cloud.core.primarystorage.js
index df91c424f57..84523293ab1 100644
--- a/ui/scripts/cloud.core.primarystorage.js
+++ b/ui/scripts/cloud.core.primarystorage.js
@@ -278,13 +278,11 @@ var primarystorageActionMap = {
         dialogBeforeActionFn: doDeletePrimaryStorage,
         inProcessText: "label.action.delete.primary.storage.processing",
         afterActionSeccessFn: function(json, $midmenuItem1, id) {   
-            $midmenuItem1.slideUp("slow", function() {
-                $(this).remove();                
-                if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) {
-                    clearRightPanel();
-                    primarystorageClearRightPanel();
-                }
-            });        
+            $midmenuItem1.remove();                             
+            if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) {
+                clearRightPanel();
+                primarystorageClearRightPanel();
+            }
         }
     }
 }
diff --git a/ui/scripts/cloud.core.resource.js b/ui/scripts/cloud.core.resource.js
index 64e16ecb85a..4c94ab520ff 100644
--- a/ui/scripts/cloud.core.resource.js
+++ b/ui/scripts/cloud.core.resource.js
@@ -1472,6 +1472,27 @@ function addZoneWizardSubmit($thisWizard) {
 		    listZonesUpdate();	
 			g_directAttachSecurityGroupsEnabled = true;
 			$("#leftmenu_security_group_container").show();
+					       
+			$.ajax({
+				data: createURL("command=listCapabilities"),
+				dataType: "json",
+				async: false,
+				success: function(json) {	
+				    /* g_supportELB: guest � ips are allocated on guest network (so use 'forvirtualnetwork' = false)
+				     * g_supportELB: public  - ips are allocated on public network (so use 'forvirtualnetwork' = true)
+				     * g_supportELB: false � no ELB support
+				     */
+				    g_supportELB = json.listcapabilitiesresponse.capability.supportELB;					    
+				    $.cookie('supportELB', g_supportELB, { expires: 1}); 
+				    				    
+				    if(g_supportELB == "guest")  //ips are allocated on guest network
+						bindAndListMidMenuItems($("#leftmenu_ip"), "listPublicIpAddresses&forvirtualnetwork=false&forloadbalancing=true", ipGetSearchParams, "listpublicipaddressesresponse", "publicipaddress", "jsp/ipaddress.jsp", afterLoadIpJSP, ipToMidmenu, ipToRightPanel, ipGetMidmenuId, false);
+					else if(g_supportELB == "public")  //ips are allocated on public network
+						bindAndListMidMenuItems($("#leftmenu_ip"), "listPublicIpAddresses&forvirtualnetwork=true&forloadbalancing=true", ipGetSearchParams, "listpublicipaddressesresponse", "publicipaddress", "jsp/ipaddress.jsp", afterLoadIpJSP, ipToMidmenu, ipToRightPanel, ipGetMidmenuId, false);
+					else			
+					    bindAndListMidMenuItems($("#leftmenu_ip"), "listPublicIpAddresses", ipGetSearchParams, "listpublicipaddressesresponse", "publicipaddress", "jsp/ipaddress.jsp", afterLoadIpJSP, ipToMidmenu, ipToRightPanel, ipGetMidmenuId, false); //remove "&forvirtualnetwork=true" for advanced zone whose security group is enabled
+				}		
+			});  
 	    },
         error: function(XMLHttpResponse) {            
 			handleError(XMLHttpResponse, function() {
diff --git a/ui/scripts/cloud.core.secondarystorage.js b/ui/scripts/cloud.core.secondarystorage.js
index 117dc9a3b8c..29c9fdae366 100644
--- a/ui/scripts/cloud.core.secondarystorage.js
+++ b/ui/scripts/cloud.core.secondarystorage.js
@@ -168,13 +168,11 @@ var secondaryStorageActionMap = {
         dialogBeforeActionFn: doDeleteSecondaryStorage,       
         inProcessText: "label.action.delete.secondary.storage.processing",
         afterActionSeccessFn: function(json, $midmenuItem1, id) {  
-			$midmenuItem1.slideUp("slow", function() {
-		        $(this).remove();                
-		        if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) {
-		            clearRightPanel();
-		            secondaryStorageClearRightPanel();
-		        }
-		    });   
+			$midmenuItem1.remove();		                   
+	        if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) {
+	            clearRightPanel();
+	            secondaryStorageClearRightPanel();
+	        }		    
         }
     } 
 }
diff --git a/ui/scripts/cloud.core.securitygroup.js b/ui/scripts/cloud.core.securitygroup.js
index 0799f936525..b24b1f172a4 100644
--- a/ui/scripts/cloud.core.securitygroup.js
+++ b/ui/scripts/cloud.core.securitygroup.js
@@ -588,13 +588,11 @@ var securityGroupActionMap = {
         dialogBeforeActionFn : doDeleteSecurityGroup,               
         inProcessText: "Deleting Security Group....",
         afterActionSeccessFn: function(json, $midmenuItem1, id) {  
-            $midmenuItem1.slideUp("slow", function() {
-                $(this).remove();                
-                if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) {
-                    clearRightPanel();
-                    securityGroupClearRightPanel();
-                }
-            });                
+			$midmenuItem1.remove(); 
+            if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) {
+                clearRightPanel();
+                securityGroupClearRightPanel();
+            }                           
         }
     }    
 }  
\ No newline at end of file
diff --git a/ui/scripts/cloud.core.serviceoffering.js b/ui/scripts/cloud.core.serviceoffering.js
index e843986c708..041ae02a3d2 100644
--- a/ui/scripts/cloud.core.serviceoffering.js
+++ b/ui/scripts/cloud.core.serviceoffering.js
@@ -82,6 +82,7 @@ function initAddServiceOfferingDialog() {
 		$dialogAddService.find("#add_service_cpucore").val("");
 		$dialogAddService.find("#add_service_cpu").val("");
 		$dialogAddService.find("#add_service_memory").val("");
+		$dialogAddService.find("#network_rate").val("");
 		$dialogAddService.find("#add_service_offerha").val("false");
 			
 		$dialogAddService
@@ -96,10 +97,11 @@ function initAddServiceOfferingDialog() {
 				isValid &= validateInteger("# of CPU Core", $thisDialog.find("#add_service_cpucore"), $thisDialog.find("#add_service_cpucore_errormsg"), 1, 1000);		
 				isValid &= validateInteger("CPU", $thisDialog.find("#add_service_cpu"), $thisDialog.find("#add_service_cpu_errormsg"), 100, 100000);		
 				isValid &= validateInteger("Memory", $thisDialog.find("#add_service_memory"), $thisDialog.find("#add_service_memory_errormsg"), 64, 1000000);	
+				isValid &= validateInteger("Network Rate", $thisDialog.find("#network_rate"), $thisDialog.find("#network_rate_errormsg"), null, null, true); //optional	
 				isValid &= validateString("Tags", $thisDialog.find("#add_service_tags"), $thisDialog.find("#add_service_tags_errormsg"), true);	//optional							
 				
 				if($thisDialog.find("#domain_container").css("display") != "none") {
-				    isValid &= validateString("Domain", $thisDialog.find("#domain"), $thisDialog.find("#domain_errormsg"), false);                             //required	
+				    isValid &= validateString("Domain", $thisDialog.find("#domain"), $thisDialog.find("#domain_errormsg"), false); //required	
 				    var domainName = $thisDialog.find("#domain").val();
 				    var domainId;
 				    if(domainName != null && domainName.length > 0) { 				    
@@ -143,6 +145,10 @@ function initAddServiceOfferingDialog() {
 				var memory = $thisDialog.find("#add_service_memory").val();
 				array1.push("&memory="+memory);	
 					
+				var networkRate = $thisDialog.find("#network_rate").val();
+				if(networkRate != null && networkRate.length > 0)
+				    array1.push("&networkrate="+networkRate);									
+				
 				var offerha = $thisDialog.find("#add_service_offerha").val();	
 				array1.push("&offerha="+offerha);								
 									
@@ -325,7 +331,8 @@ function serviceOfferingJsonToDetailsTab() {
     
     $thisTab.find("#storagetype").text(fromdb(jsonObj.storagetype));
     $thisTab.find("#cpu").text(jsonObj.cpunumber + " x " + convertHz(jsonObj.cpuspeed));
-    $thisTab.find("#memory").text(convertBytes(parseInt(jsonObj.memory)*1024*1024));
+    $thisTab.find("#memory").text(convertBytes(parseInt(jsonObj.memory)*1024*1024));
+    $thisTab.find("#network_rate").text(fromdb(jsonObj.networkrate));
     
     setBooleanReadField(jsonObj.offerha, $thisTab.find("#offerha"));	
     setBooleanEditField(jsonObj.offerha, $thisTab.find("#offerha_edit"));
@@ -391,13 +398,11 @@ var serviceOfferingActionMap = {
         dialogBeforeActionFn : doDeleteServiceOffering,               
         inProcessText: "label.action.delete.service.offering.processing",
         afterActionSeccessFn: function(json, $midmenuItem1, id) {
-            $midmenuItem1.slideUp("slow", function() {
-                $(this).remove();                
-                if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) {
-                    clearRightPanel();
-                    serviceOfferingClearRightPanel();
-                }                
-            });    
+    		$midmenuItem1.remove();    
+            if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) {
+                clearRightPanel();
+                serviceOfferingClearRightPanel();
+            }                  
         }
     }    
 }  
\ No newline at end of file
diff --git a/ui/scripts/cloud.core.snapshot.js b/ui/scripts/cloud.core.snapshot.js
index e63f6a67993..fdfb33b7e76 100644
--- a/ui/scripts/cloud.core.snapshot.js
+++ b/ui/scripts/cloud.core.snapshot.js
@@ -198,7 +198,8 @@ function snapshotClearDetailsTab() {
     var $thisTab = $("#right_panel_content #tab_content_details");   
     $thisTab.find("#id").text("");
     $thisTab.find("#name").text("");
-    $thisTab.find("#volume_name").text("");
+    $thisTab.find("#volume_name").text("");    
+    $thisTab.find("#state").text("");
     $thisTab.find("#interval_type").text("");
     $thisTab.find("#account").text("");
     $thisTab.find("#domain").text("");      
@@ -220,13 +221,11 @@ var snapshotActionMap = {
 		dialogBeforeActionFn : doSnapshotDelete,
         inProcessText: "label.action.delete.snapshot.processing",
         afterActionSeccessFn: function(json, $midmenuItem1, id){   
-            $midmenuItem1.slideUp("slow", function() {
-                $(this).remove();                
-                if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) {
-                    clearRightPanel();
-                    snapshotClearRightPanel();
-                }
-            });            
+    		$midmenuItem1.remove();                                   
+            if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) {
+                clearRightPanel();
+                snapshotClearRightPanel();
+            }                      
         }
     } 
     ,
diff --git a/ui/scripts/cloud.core.systemserviceoffering.js b/ui/scripts/cloud.core.systemserviceoffering.js
index 2a7841f361a..c677971b72b 100644
--- a/ui/scripts/cloud.core.systemserviceoffering.js
+++ b/ui/scripts/cloud.core.systemserviceoffering.js
@@ -401,13 +401,11 @@ var systemServiceOfferingActionMap = {
         dialogBeforeActionFn : doDeleteSystemServiceOffering,               
         inProcessText: "label.action.delete.service.offering.processing",
         afterActionSeccessFn: function(json, $midmenuItem1, id) {
-            $midmenuItem1.slideUp("slow", function() {
-                $(this).remove();                
-                if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) {
-                    clearRightPanel();
-                    systemServiceOfferingClearRightPanel();
-                }                
-            });    
+    	    $midmenuItem1.remove();                          
+            if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) {
+                clearRightPanel();
+                systemServiceOfferingClearRightPanel();
+            }         
         }
     }    
 }  
\ No newline at end of file
diff --git a/ui/scripts/cloud.core.volume.js b/ui/scripts/cloud.core.volume.js
index ab1f7dcdb7d..84057143a79 100644
--- a/ui/scripts/cloud.core.volume.js
+++ b/ui/scripts/cloud.core.volume.js
@@ -433,7 +433,7 @@ function volumeJsonToDetailsTab(){
 		$thisTab.find("#vm_name").text(getVmName(jsonObj.vmname, jsonObj.vmdisplayname) + " (" + fromdb(jsonObj.vmstate) + ")");		
     setDateField(jsonObj.created, $thisTab.find("#created"));	
      
-    if(isAdmin() || isDomainAdmin()) {
+    if(isAdmin()) {
     	$thisTab.find("#storage").text(fromdb(jsonObj.storage));
     	$thisTab.find("#storage_container").show();
     }
@@ -449,7 +449,9 @@ function volumeJsonToDetailsTab(){
         
     buildActionLinkForTab("label.action.take.snapshot", volumeActionMap, $actionMenu, $midmenuItem1, $thisTab);	//show take snapshot
     buildActionLinkForTab("label.action.recurring.snapshot", volumeActionMap, $actionMenu, $midmenuItem1, $thisTab);	//show Recurring Snapshot
-    buildActionLinkForTab("label.action.download.volume", volumeActionMap, $actionMenu, $midmenuItem1, $thisTab);
+    
+    if(jsonObj.state != "Allocated")
+        buildActionLinkForTab("label.action.download.volume", volumeActionMap, $actionMenu, $midmenuItem1, $thisTab);
     
     if(jsonObj.state != "Creating" && jsonObj.state != "Corrupted" && jsonObj.name != "attaching") {
         if(jsonObj.type=="ROOT") {
@@ -601,13 +603,11 @@ var volumeActionMap = {
         dialogBeforeActionFn : doDeleteVolume,      
         inProcessText: "label.action.delete.volume.processing",
         afterActionSeccessFn: function(json, $midmenuItem1, id) {  
-            $midmenuItem1.slideUp("slow", function() {
-                $(this).remove();                
-                if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) {
-                    clearRightPanel();
-                    volumeClearRightPanel();
-                }
-            });          
+    	    $midmenuItem1.remove();
+            if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) {
+                clearRightPanel();
+                volumeClearRightPanel();
+            }                      
         }
     },
     "label.action.take.snapshot": {
diff --git a/ui/scripts/cloud.core.zone.js b/ui/scripts/cloud.core.zone.js
index 7c697c35d5c..b8919de9973 100644
--- a/ui/scripts/cloud.core.zone.js
+++ b/ui/scripts/cloud.core.zone.js
@@ -396,13 +396,11 @@ var zoneActionMap = {
         dialogBeforeActionFn : doDeleteZone,  
         inProcessText: "label.action.delete.zone.processing",
         afterActionSeccessFn: function(json, $leftmenuItem1, id) {   
-            $leftmenuItem1.slideUp(function() {
-                $(this).remove();                                
-                if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) {
-                    clearRightPanel();
-                    zoneJsonClearRightPanel();
-                }                
-            });            
+            $leftmenuItem1.remove();                                         
+            if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) {
+                clearRightPanel();
+                zoneJsonClearRightPanel();
+            }          
         }
     }
 }