diff --git a/ui/jsp/resource.jsp b/ui/jsp/resource.jsp
index 67e1f28e82b..5f107862132 100644
--- a/ui/jsp/resource.jsp
+++ b/ui/jsp/resource.jsp
@@ -67,7 +67,23 @@
 					<label for="add_zone_guestcidraddress">Guest CIDR:</label>
 					<input class="text" type="text" id="add_zone_guestcidraddress" value="10.1.1.0/24"/>
 					<div id="add_zone_guestcidraddress_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
+				</li>				
+				<li>
+					<label>Public?:</label>
+					<select class="select" id="add_zone_public">
+					    <option value="true">Yes</option>		
+						<option value="false">No</option>										
+					</select>
+				</li>	
+				
+				
+				<li id="domain_dropdown_container" style="display:none">
+					<label>Domain:</label>
+					<select class="select" id="domain_dropdown">					
+					</select>
 				</li>
+				
+				
 			</ol>
 		</form>
 	</div>
diff --git a/ui/scripts/cloud.core.resource.js b/ui/scripts/cloud.core.resource.js
index f37f21dd533..a6d2089c111 100644
--- a/ui/scripts/cloud.core.resource.js
+++ b/ui/scripts/cloud.core.resource.js
@@ -371,7 +371,34 @@ function initUpdateConsoleCertButton($midMenuAddLink2) {
 
 function initAddZoneButton($midmenuAddLink1) {
     $midmenuAddLink1.find("#label").text("Add Zone");     
-    $midmenuAddLink1.show();     
+    $midmenuAddLink1.show();  
+        
+    var $dialogAddZone = $("#dialog_add_zone");
+    $dialogAddZone.find("#add_zone_public").unbind("change").bind("change", function(event) {        
+        if($(this).val() == "true") {  //public zone
+            $dialogAddZone.find("#domain_dropdown_container").hide();  
+        }
+        else {  //private zone
+            $dialogAddZone.find("#domain_dropdown_container").show();  
+        }
+        return false;
+    });
+         
+    var domainDropdown = $dialogAddZone.find("#domain_dropdown").empty();	
+	$.ajax({
+	  data: createURL("command=listDomains"+maxPageSize),
+		dataType: "json",
+		async: false,
+		success: function(json) {
+			var domains = json.listdomainsresponse.domain;						
+			if (domains != null && domains.length > 0) {
+				for (var i = 0; i < domains.length; i++) {
+					domainDropdown.append("<option value='" + domains[i].id + "'>" + fromdb(domains[i].name) + "</option>"); 
+				}
+			} 
+		}
+	});   
+       
     $midmenuAddLink1.unbind("click").bind("click", function(event) {  
         $("#dialog_add_zone").find("#info_container").hide();				
     
@@ -427,7 +454,12 @@ function initAddZoneButton($midmenuAddLink1) {
 				
 				var guestcidraddress = trim($thisDialog.find("#add_zone_guestcidraddress").val());
 				moreCriteria.push("&guestcidraddress="+encodeURIComponent(guestcidraddress));	
-										
+								
+				if($thisDialog.find("#domain_dropdown_container").css("display") != "none") {
+				    var domainId = trim($thisDialog.find("#domain_dropdown").val());
+				    moreCriteria.push("&domainid="+domainId);	
+				}
+														
                 $.ajax({
 			        data: createURL("command=createZone"+moreCriteria.join("")),
 				    dataType: "json",
diff --git a/ui/test/index.html b/ui/test/index.html
index 79ebc911f18..ff788b1f90e 100644
--- a/ui/test/index.html
+++ b/ui/test/index.html
@@ -16,8 +16,8 @@
 	<link rel= "stylesheet" href="css/cloud_custom.css" type="text/css" />
 	
     <!-- Javascripts -->
-    <script type="text/javascript" src="../scripts/jquery-1.4.2.min.js"></script>
-    <script type="text/javascript" src="../scripts/jquery-ui-1.8.2.custom.min.js"></script>
+    <script type="text/javascript" src="../scripts/jquery.min.js"></script>
+    <script type="text/javascript" src="../scripts/jquery-ui.custom.min.js"></script>
     <script type="text/javascript" src="../scripts/date.js"></script>
     <script type="text/javascript" src="../scripts/jquery.cookies.js"></script>
     <script type="text/javascript" src="../scripts/jquery.timers.js"></script>