diff --git a/ui/index.jsp b/ui/index.jsp
index 3fe04850c2a..dc68a470ba8 100755
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -49,6 +49,15 @@ long milliseconds = new Date().getTime();
 	<script type="text/javascript" src="scripts/cloud.logger.js?t=<%=milliseconds%>"></script>
 	<script type="text/javascript" src="scripts/cloud.core.js?t=<%=milliseconds%>"></script>
 	<script type="text/javascript" src="scripts/cloud.core.init.js?t=<%=milliseconds%>"></script>
+	<script type="text/javascript" src="scripts/cloud.core.configuration.js?t=<%=milliseconds%>"></script>
+	<script type="text/javascript" src="scripts/cloud.core.templates.js?t=<%=milliseconds%>"></script>
+	<script type="text/javascript" src="scripts/cloud.core.storage.js?t=<%=milliseconds%>"></script>
+	<script type="text/javascript" src="scripts/cloud.core.network.js?t=<%=milliseconds%>"></script>
+	<script type="text/javascript" src="scripts/cloud.core.hosts.js?t=<%=milliseconds%>"></script>
+	<script type="text/javascript" src="scripts/cloud.core.instances.js?t=<%=milliseconds%>"></script>
+	<script type="text/javascript" src="scripts/cloud.core.domains.js?t=<%=milliseconds%>"></script>
+	<script type="text/javascript" src="scripts/cloud.core.events.js?t=<%=milliseconds%>"></script>
+	<script type="text/javascript" src="scripts/cloud.core.accounts.js?t=<%=milliseconds%>"></script>
 		
 	<!-- Favicon -->
 	<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
diff --git a/ui/jsp/tab_accounts.jsp b/ui/jsp/tab_accounts.jsp
index df4da1544c5..8bd1bb882b8 100755
--- a/ui/jsp/tab_accounts.jsp
+++ b/ui/jsp/tab_accounts.jsp
@@ -2,7 +2,6 @@
 <%
 long milliseconds = new Date().getTime();
 %>
-<script type="text/javascript" src="scripts/cloud.core.accounts.js?t=<%=milliseconds%>"></script>
 	
 <!-- Accounts -->
 <div class="maincontent" style="display:block;" id="submenu_content_account">
diff --git a/ui/jsp/tab_configuration.jsp b/ui/jsp/tab_configuration.jsp
index 163c056effc..c9f574702fc 100755
--- a/ui/jsp/tab_configuration.jsp
+++ b/ui/jsp/tab_configuration.jsp
@@ -2,7 +2,6 @@
 <%
 long milliseconds = new Date().getTime();
 %>
-<script type="text/javascript" src="scripts/cloud.core.configuration.js?t=<%=milliseconds%>"></script>
 	
 <!-- Content Panel -->
 <!-- Submenu -->
@@ -434,7 +433,7 @@ long milliseconds = new Date().getTime();
 					<input class="text" type="text" name="add_publicip_vlan_vlan" id="add_publicip_vlan_vlan"/>
 					<div id="add_publicip_vlan_vlan_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
 				</li>
-				<li style="display:none" id="add_publicip_vlan_scope_container">
+				<li id="add_publicip_vlan_scope_container">
 					<label for="add_publicip_vlan_scope">Scope:</label>
 					<select class="select" name="add_publicip_vlan_scope" id="add_publicip_vlan_scope">
 					    <option value="zone-wide">zone-wide</option>
diff --git a/ui/jsp/tab_domains.jsp b/ui/jsp/tab_domains.jsp
index dbe56fb321d..5a9ceb6bfa3 100755
--- a/ui/jsp/tab_domains.jsp
+++ b/ui/jsp/tab_domains.jsp
@@ -2,7 +2,6 @@
 <%
 long milliseconds = new Date().getTime();
 %>
-<script type="text/javascript" src="scripts/cloud.core.domains.js?t=<%=milliseconds%>"></script>
 	
 <!-- Content Panel -->
 <div class="maincontent" style="display:block;" id="submenu_content_domains">
diff --git a/ui/jsp/tab_events.jsp b/ui/jsp/tab_events.jsp
index f5c4ac48e88..e83a0bed7ac 100755
--- a/ui/jsp/tab_events.jsp
+++ b/ui/jsp/tab_events.jsp
@@ -2,7 +2,6 @@
 <%
 long milliseconds = new Date().getTime();
 %>
-<script type="text/javascript" src="scripts/cloud.core.events.js?t=<%=milliseconds%>"></script>
 
 <!-- Content Panel -->
 <!-- Submenus -->
diff --git a/ui/jsp/tab_hosts.jsp b/ui/jsp/tab_hosts.jsp
index 438efabae1e..3e0eb71ae30 100755
--- a/ui/jsp/tab_hosts.jsp
+++ b/ui/jsp/tab_hosts.jsp
@@ -2,7 +2,6 @@
 <%
 long milliseconds = new Date().getTime();
 %>
-<script type="text/javascript" src="scripts/cloud.core.hosts.js?t=<%=milliseconds%>"></script>
 	
 <div class="maincontent" id="submenu_content_routing" style="display:block">
 	<div id="maincontent_title">
diff --git a/ui/jsp/tab_instances.jsp b/ui/jsp/tab_instances.jsp
index 856ca9189c8..6676b55432e 100755
--- a/ui/jsp/tab_instances.jsp
+++ b/ui/jsp/tab_instances.jsp
@@ -2,7 +2,6 @@
 <%
 long milliseconds = new Date().getTime();
 %>
-<script type="text/javascript" src="scripts/cloud.core.instances.js?t=<%=milliseconds%>"></script>
 
 <!-- Content Panel -->
 <!-- Submenu -->
diff --git a/ui/jsp/tab_networking.jsp b/ui/jsp/tab_networking.jsp
index 98a76bd3423..ae81f2d107e 100755
--- a/ui/jsp/tab_networking.jsp
+++ b/ui/jsp/tab_networking.jsp
@@ -2,7 +2,7 @@
 <%
 long milliseconds = new Date().getTime();
 %>
-<script type="text/javascript" src="scripts/cloud.core.network.js?t=<%=milliseconds%>"></script>
+
 <!-- Content Panel -->
 <!-- Submenus -->
 <div class="submenu_links">
diff --git a/ui/jsp/tab_storage.jsp b/ui/jsp/tab_storage.jsp
index aaab49adb19..f84a9405cde 100755
--- a/ui/jsp/tab_storage.jsp
+++ b/ui/jsp/tab_storage.jsp
@@ -2,7 +2,6 @@
 <%
 long milliseconds = new Date().getTime();
 %>
-<script type="text/javascript" src="scripts/cloud.core.storage.js?t=<%=milliseconds%>"></script>
 	
 <div class="submenu_links">
     <div class="submenu_links_on" id="submenu_pool">
diff --git a/ui/jsp/tab_templates.jsp b/ui/jsp/tab_templates.jsp
index 9242b056254..d4e54e4161f 100755
--- a/ui/jsp/tab_templates.jsp
+++ b/ui/jsp/tab_templates.jsp
@@ -2,7 +2,6 @@
 <%
 long milliseconds = new Date().getTime();
 %>
-<script type="text/javascript" src="scripts/cloud.core.templates.js?t=<%=milliseconds%>"></script>
 	
 <div class="submenu_links">		
     <div class="submenu_links_on" id="submenu_template">Template</div>
diff --git a/ui/scripts/cloud.core.configuration.js b/ui/scripts/cloud.core.configuration.js
index 921ce540ada..1bfcb7b1199 100644
--- a/ui/scripts/cloud.core.configuration.js
+++ b/ui/scripts/cloud.core.configuration.js
@@ -701,10 +701,7 @@ function showConfigurationTab() {
 					isTagged = thisDialog.find("#add_publicip_vlan_tagged").val() == "tagged";
 				}
 				
-				if (isDirect && isTagged) 
-					isValid &= validateString("Account", thisDialog.find("#add_publicip_vlan_account"), thisDialog.find("#add_publicip_vlan_account_errormsg"), false); //required
-				else
-				    isValid &= validateString("Account", thisDialog.find("#add_publicip_vlan_account"), thisDialog.find("#add_publicip_vlan_account_errormsg"), true); //optional
+				isValid &= validateString("Account", thisDialog.find("#add_publicip_vlan_account"), thisDialog.find("#add_publicip_vlan_account_errormsg"), true); //optional
 				
 				if (isTagged) {
 					isValid &= validateNumber("VLAN", thisDialog.find("#add_publicip_vlan_vlan"), thisDialog.find("#add_publicip_vlan_vlan_errormsg"), 2, 4095);
@@ -721,15 +718,11 @@ function showConfigurationTab() {
 				} else {
 					vlan = "&vlan=untagged";
 				}
-				var directParams = "";
-				if (isDirect && isTagged) {
-					directParams = "&domainId="+trim(thisDialog.find("#add_publicip_vlan_domain").val())+"&account="+trim(thisDialog.find("#add_publicip_vlan_account").val());
-				} else if (isDirect && !isTagged) {
-					directParams = "&podId="+trim(thisDialog.find("#add_publicip_vlan_pod").val());
-				} else if (!isDirect && (dialogAddVlanForZone.find("#add_publicip_vlan_scope").val()=="account-specific")) {  //public VLAN, account-specific
-				    directParams = "&domainId="+trim(thisDialog.find("#add_publicip_vlan_domain").val())+"&account="+trim(thisDialog.find("#add_publicip_vlan_account").val());
-				}					
-				
+								
+				var scopeParams = "";
+				if(dialogAddVlanForZone.find("#add_publicip_vlan_scope").val()=="account-specific")
+				    scopeParams = "&domainId="+trim(thisDialog.find("#add_publicip_vlan_domain").val())+"&account="+trim(thisDialog.find("#add_publicip_vlan_account").val());    
+								
 				var type = "true";
 				if (getNetworkType() == "vlan") type = trim(thisDialog.find("#add_publicip_vlan_type").val());
 				var gateway = trim(thisDialog.find("#add_publicip_vlan_gateway").val());
@@ -751,7 +744,7 @@ function showConfigurationTab() {
 		        template.fadeIn("slow");					
 				
 				$.ajax({
-				  data: createURL("command=createVlanIpRange&forVirtualNetwork="+type+"&zoneId="+id+vlan+directParams+"&gateway="+encodeURIComponent(gateway)+"&netmask="+encodeURIComponent(netmask)+"&startip="+encodeURIComponent(startip)+"&endip="+encodeURIComponent(endip)+"&response=json"),
+				  data: createURL("command=createVlanIpRange&forVirtualNetwork="+type+"&zoneId="+id+vlan+scopeParams+"&gateway="+encodeURIComponent(gateway)+"&netmask="+encodeURIComponent(netmask)+"&startip="+encodeURIComponent(startip)+"&endip="+encodeURIComponent(endip)+"&response=json"),
 					dataType: "json",
 					success: function(json) {
 						var vlan = json.createvlaniprangeresponse;
@@ -1045,21 +1038,16 @@ function showConfigurationTab() {
 	dialogAddVlanForZone.find("#add_publicip_vlan_type").change(function(event) {
 	    var addPublicipVlanTagged = dialogAddVlanForZone.find("#add_publicip_vlan_tagged").empty();
 	   	
-		if ($(this).val() == "false") { //direct VLAN (only tagged option)				
-			dialogAddVlanForZone.find("#add_publicip_vlan_scope_container").hide();		
+		// default value of "#add_publicip_vlan_scope" is "zone-wide". Calling change() will hide "#add_publicip_vlan_domain_container", "#add_publicip_vlan_account_container". 
+		dialogAddVlanForZone.find("#add_publicip_vlan_scope").change(); 
+		
+		if ($(this).val() == "false") { //direct VLAN (only tagged option)		
 			addPublicipVlanTagged.append('<option value="tagged">tagged</option>');
 							
-			dialogAddVlanForZone.find("#add_publicip_vlan_vlan_container").show();
-			dialogAddVlanForZone.find("#add_publicip_vlan_domain_container").show();
-			dialogAddVlanForZone.find("#add_publicip_vlan_account_container").show();
+			dialogAddVlanForZone.find("#add_publicip_vlan_vlan_container").show();			
 			dialogAddVlanForZone.find("#add_publicip_vlan_pod_container").hide();
 			
-		} else { //public VLAN				
-			dialogAddVlanForZone.find("#add_publicip_vlan_scope_container").show();
-			
-			// default value of "#add_publicip_vlan_scope" is "zone-wide". Calling change() will hide "#add_publicip_vlan_domain_container", "#add_publicip_vlan_account_container". 
-			dialogAddVlanForZone.find("#add_publicip_vlan_scope").change(); 					
-							
+		} else { //public VLAN	
 			addPublicipVlanTagged.append('<option value="untagged">untagged</option>').append('<option value="tagged">tagged</option>');	
 			
 			if (dialogAddVlanForZone.find("#add_publicip_vlan_tagged") == "tagged") {
@@ -1074,20 +1062,14 @@ function showConfigurationTab() {
 	});
 			
 	if (getNetworkType() != "vnet") {
-		dialogAddVlanForZone.find("#add_publicip_vlan_tagged").change(function(event) {
-			if (dialogAddVlanForZone.find("#add_publicip_vlan_type").val() == "false") { //direct VLAN (only tagged option)						
-				dialogAddVlanForZone.find("#add_publicip_vlan_scope_container").hide();					
-				dialogAddVlanForZone.find("#add_publicip_vlan_vlan_container").show();
-				dialogAddVlanForZone.find("#add_publicip_vlan_domain_container").show();
-				dialogAddVlanForZone.find("#add_publicip_vlan_account_container").show();
-				dialogAddVlanForZone.find("#add_publicip_vlan_pod_container").hide();					
+		dialogAddVlanForZone.find("#add_publicip_vlan_tagged").change(function(event) {			
+			// default value of "#add_publicip_vlan_scope" is "zone-wide". Calling change() will hide "#add_publicip_vlan_domain_container", "#add_publicip_vlan_account_container". 
+			dialogAddVlanForZone.find("#add_publicip_vlan_scope").change(); 	
 			
+			if (dialogAddVlanForZone.find("#add_publicip_vlan_type").val() == "false") { //direct VLAN (only tagged option)						
+				dialogAddVlanForZone.find("#add_publicip_vlan_vlan_container").show();				
+				dialogAddVlanForZone.find("#add_publicip_vlan_pod_container").hide();	
 			} else { //public VLAN		
-			    dialogAddVlanForZone.find("#add_publicip_vlan_scope_container").show();
-			    
-			    // default value of "#add_publicip_vlan_scope" is "zone-wide". Calling change() will hide "#add_publicip_vlan_domain_container", "#add_publicip_vlan_account_container". 
-			    dialogAddVlanForZone.find("#add_publicip_vlan_scope").change(); 				
-			    
 				if ($(this).val() == "tagged") {
 					dialogAddVlanForZone.find("#add_publicip_vlan_vlan_container").show();
 					dialogAddVlanForZone.find("#add_publicip_vlan_pod_container").hide();
@@ -1102,7 +1084,7 @@ function showConfigurationTab() {
 		dialogAddVlanForZone.find("#add_publicip_vlan_container").hide();
 	}
 	
-	dialogAddVlanForZone.find("#add_publicip_vlan_scope").change(function(event) {
+	dialogAddVlanForZone.find("#add_publicip_vlan_scope").change(function(event) {	   
 	    if($(this).val() == "zone-wide") {
 	        dialogAddVlanForZone.find("#add_publicip_vlan_domain_container").hide();
 			dialogAddVlanForZone.find("#add_publicip_vlan_account_container").hide();