diff --git a/ui/content/tab_accounts.html b/ui/jsp/tab_accounts.jsp
old mode 100644
new mode 100755
similarity index 98%
rename from ui/content/tab_accounts.html
rename to ui/jsp/tab_accounts.jsp
index 5a63bb419c5..df4da1544c5
--- a/ui/content/tab_accounts.html
+++ b/ui/jsp/tab_accounts.jsp
@@ -1,4 +1,8 @@
-<script type="text/javascript" src="scripts/cloud.core.accounts.js"></script>
+<%@ page import="java.util.Date" %>
+<%
+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/content/tab_configuration.html b/ui/jsp/tab_configuration.jsp
old mode 100644
new mode 100755
similarity index 99%
rename from ui/content/tab_configuration.html
rename to ui/jsp/tab_configuration.jsp
index 9bdbd581bb9..163c056effc
--- a/ui/content/tab_configuration.html
+++ b/ui/jsp/tab_configuration.jsp
@@ -1,4 +1,8 @@
-<script type="text/javascript" src="scripts/cloud.core.configuration.js"></script>
+<%@ page import="java.util.Date" %>
+<%
+long milliseconds = new Date().getTime();
+%>
+<script type="text/javascript" src="scripts/cloud.core.configuration.js?t=<%=milliseconds%>"></script>
 	
 <!-- Content Panel -->
 <!-- Submenu -->
diff --git a/ui/content/tab_dashboard.html b/ui/jsp/tab_dashboard.jsp
old mode 100644
new mode 100755
similarity index 100%
rename from ui/content/tab_dashboard.html
rename to ui/jsp/tab_dashboard.jsp
diff --git a/ui/jsp/tab_domains.jsp b/ui/jsp/tab_domains.jsp
old mode 100644
new mode 100755
index 1d258ca1b48..dbe56fb321d
--- a/ui/jsp/tab_domains.jsp
+++ b/ui/jsp/tab_domains.jsp
@@ -1,5 +1,8 @@
-
-<script type="text/javascript" src="scripts/cloud.core.domains.js"></script>
+<%@ page import="java.util.Date" %>
+<%
+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/content/tab_events.html b/ui/jsp/tab_events.jsp
old mode 100644
new mode 100755
similarity index 98%
rename from ui/content/tab_events.html
rename to ui/jsp/tab_events.jsp
index 2ffd07662eb..f5c4ac48e88
--- a/ui/content/tab_events.html
+++ b/ui/jsp/tab_events.jsp
@@ -1,4 +1,8 @@
-<script type="text/javascript" src="scripts/cloud.core.events.js"></script>
+<%@ page import="java.util.Date" %>
+<%
+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/content/tab_hosts.html b/ui/jsp/tab_hosts.jsp
old mode 100644
new mode 100755
similarity index 98%
rename from ui/content/tab_hosts.html
rename to ui/jsp/tab_hosts.jsp
index 6d4cf09ab66..438efabae1e
--- a/ui/content/tab_hosts.html
+++ b/ui/jsp/tab_hosts.jsp
@@ -1,4 +1,8 @@
-<script type="text/javascript" src="scripts/cloud.core.hosts.js"></script>
+<%@ page import="java.util.Date" %>
+<%
+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/content/tab_instances.html b/ui/jsp/tab_instances.jsp
old mode 100644
new mode 100755
similarity index 99%
rename from ui/content/tab_instances.html
rename to ui/jsp/tab_instances.jsp
index 55991f3ff01..856ca9189c8
--- a/ui/content/tab_instances.html
+++ b/ui/jsp/tab_instances.jsp
@@ -1,4 +1,8 @@
-<script type="text/javascript" src="scripts/cloud.core.instances.js"></script>	
+<%@ page import="java.util.Date" %>
+<%
+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/content/tab_networking.html b/ui/jsp/tab_networking.jsp
old mode 100644
new mode 100755
similarity index 99%
rename from ui/content/tab_networking.html
rename to ui/jsp/tab_networking.jsp
index e78b41eb636..98a76bd3423
--- a/ui/content/tab_networking.html
+++ b/ui/jsp/tab_networking.jsp
@@ -1,4 +1,8 @@
-<script type="text/javascript" src="scripts/cloud.core.network.js"></script>
+<%@ page import="java.util.Date" %>
+<%
+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/content/tab_storage.html b/ui/jsp/tab_storage.jsp
old mode 100644
new mode 100755
similarity index 99%
rename from ui/content/tab_storage.html
rename to ui/jsp/tab_storage.jsp
index 3abfa48568f..92f6b5ae5fb
--- a/ui/content/tab_storage.html
+++ b/ui/jsp/tab_storage.jsp
@@ -1,4 +1,8 @@
-<script type="text/javascript" src="scripts/cloud.core.storage.js"></script>
+<%@ page import="java.util.Date" %>
+<%
+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/content/tab_templates.html b/ui/jsp/tab_templates.jsp
old mode 100644
new mode 100755
similarity index 99%
rename from ui/content/tab_templates.html
rename to ui/jsp/tab_templates.jsp
index 3438c971de2..db678162dbd
--- a/ui/content/tab_templates.html
+++ b/ui/jsp/tab_templates.jsp
@@ -1,4 +1,8 @@
-<script type="text/javascript" src="scripts/cloud.core.templates.js"></script>
+<%@ page import="java.util.Date" %>
+<%
+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.domains.js b/ui/scripts/cloud.core.domains.js
index db94223d8f1..572ebe8dbad 100644
--- a/ui/scripts/cloud.core.domains.js
+++ b/ui/scripts/cloud.core.domains.js
@@ -66,7 +66,7 @@ function showDomainsTab() {
     
     function drawTree(id, level, container) {		        
         $.ajax({
-		    data: "command=listDomainChildren&id="+id+"&response=json&pageSize=-1",
+		    data: createURL("command=listDomainChildren&id="+id+"&response=json&pageSize=-1"),
 		    dataType: "json",
 		    async: false,
 		    success: function(json) {					        
@@ -321,7 +321,7 @@ function showDomainsTab() {
 	    rightPanelSearchResult.show();	                	        	
         var keyword = searchInput.val();             
         $.ajax({
-	        data: "command=listDomains&keyword="+keyword+"&response=json&pageSize=-1", //pageSize=-1 will return all items (no limitation)
+	        data: createURL("command=listDomains&keyword="+keyword+"&response=json&pageSize=-1"), //pageSize=-1 will return all items (no limitation)
 	        dataType: "json",
 	        async: false,
 	        success: function(json) {					        
@@ -350,7 +350,7 @@ function showDomainsTab() {
 	function drawRootNode(rootDomainId) {
 	    treeContentBox.empty();
 	    $.ajax({
-	        data: "command=listDomains&id="+rootDomainId+"&response=json&pageSize=-1", //pageSize=-1 will return all items (no limitation)
+	        data: createURL("command=listDomains&id="+rootDomainId+"&response=json&pageSize=-1"), //pageSize=-1 will return all items (no limitation)
 	        dataType: "json",
 	        async: false,
 	        success: function(json) {					        
diff --git a/ui/scripts/cloud.core.init.js b/ui/scripts/cloud.core.init.js
index a6d0035e164..ffc2e3bfa3c 100644
--- a/ui/scripts/cloud.core.init.js
+++ b/ui/scripts/cloud.core.init.js
@@ -29,7 +29,7 @@ $(document).ready(function() {
 	mainContainer = $("#maincontentarea");
 
 	// Tab Links, dashboard is the initial active tab
-	mainContainer.load("content/tab_dashboard.html");
+	mainContainer.load("jsp/tab_dashboard.jsp");
 	
 	// Default AJAX Setup
 	$.ajaxSetup({
@@ -285,31 +285,31 @@ $(document).ready(function() {
 		if (tabId == "menutab_dashboard_user" || tabId == "menutab_dashboard_root" || tabId == "menutab_dashboard_domain") {
 			showDashboardTab();
 		} else if (tabId == "menutab_vm") {
-		    mainContainer.load("content/tab_instances.html", function() {
+		    mainContainer.load("jsp/tab_instances.jsp", function() {
 			    showInstancesTab(tab.data("domainId"), tab.data("account"));	
 		    });		
 		} else if (tabId == "menutab_networking") {
-		    mainContainer.load("content/tab_networking.html", function() {
+		    mainContainer.load("jsp/tab_networking.jsp", function() {
 		        showNetworkingTab(tab.data("domainId"), tab.data("account"));
 		    });	
 		} else if (tabId == "menutab_templates") {
-		    mainContainer.load("content/tab_templates.html", function() {
+		    mainContainer.load("jsp/tab_templates.jsp", function() {
 			    showTemplatesTab();
 			});	
 		} else if (tabId == "menutab_events") {
-			mainContainer.load("content/tab_events.html", function() {			    
+			mainContainer.load("jsp/tab_events.jsp", function() {			    
 			    showEventsTab(tab.data("showEvents"));
 			});
 		} else if (tabId == "menutab_hosts") {
-			mainContainer.load("content/tab_hosts.html", function() {		
+			mainContainer.load("jsp/tab_hosts.jsp", function() {		
 			    showHostsTab();
 			});
 	    } else if (tabId == "menutab_storage") {
-			mainContainer.load("content/tab_storage.html", function() {		
+			mainContainer.load("jsp/tab_storage.jsp", function() {		
 			    showStorageTab(tab.data("domainId"), tab.data("targetTab"));
 			});
 		} else if (tabId == "menutab_accounts") {
-			mainContainer.load("content/tab_accounts.html", function() {	
+			mainContainer.load("jsp/tab_accounts.jsp", function() {	
 			    showAccountsTab(tab.data("domainId"));
 			});
 		} else if (tabId == "menutab_domain") {
@@ -317,7 +317,7 @@ $(document).ready(function() {
 			    showDomainsTab();
 			});
 		} else if (tabId == "menutab_configuration") {
-			mainContainer.load("content/tab_configuration.html", function() {
+			mainContainer.load("jsp/tab_configuration.jsp", function() {
 			    showConfigurationTab();
 			});
 		} else {
@@ -342,7 +342,7 @@ $(document).ready(function() {
 	
 	// Dashboard Tab
 	function showDashboardTab() {
-		mainContainer.load("content/tab_dashboard.html", function() {
+		mainContainer.load("jsp/tab_dashboard.jsp", function() {
 			$(".header_topright #header_username").text($.cookie("username"));
 			
 			if (isAdmin()) {