diff --git a/manage.html b/manage.html
index 993a077..cc0f5b0 100644
--- a/manage.html
+++ b/manage.html
@@ -143,6 +143,26 @@ function get_deployments() {
 	  }
   });
 }
+
+function load_template(additional) {
+  var url  = 'scan.php?op=deployment&additional='+additional;
+  jQuery.get(url, function(data) {
+	  if (data=="OK") {
+      		setTimeout(check_deployment, 500, additional);
+	  }
+  });
+}
+
+function check_deployment(additional) {
+  var url  = 'scan.php?op=check_deployment';
+  jQuery.get(url, function(data) {
+      if (data!="") {
+	      jQuery("#"+additional).html(data);
+      }
+      else setTimeout(check_deployment, 500, additional);
+  });
+}
+
 function check_containers() {
   var url  = 'scan.php?op=check_containers';
   jQuery.get(url, function(data) {
diff --git a/scan.php b/scan.php
index 246d311..3d4f039 100644
--- a/scan.php
+++ b/scan.php
@@ -76,7 +76,8 @@ switch ($_GET["op"]) {
 						else {
 							foreach ($data["DEPLOYMENTS"] as $service_name => $content) {
 								//echo base64_decode($content);
-								echo $service_name."<br>";
+								echo '<div><a href="#" onclick="load_template(\''.$service_name.'\')">'.$service_name.'</a> - '.$content.'</div>';
+								echo '<div id="'.$service_name.'"></div>'
 							}
 						}
 					}
@@ -107,6 +108,23 @@ switch ($_GET["op"]) {
 		redis_set($op,$json);
 		echo "OK"; // TODO?
 	break;
+	case "check_deployment":
+		$arr = check_redis("web_out","deployment");
+		if (!empty($arr)) {
+			foreach ($arr as $key=>$data) {
+				if ($key=="deployment") {
+					if ($data["STATUS"]=="0") { // ask
+						echo base64_decode($data["TEMPLATE"]);
+					}
+					else { // deploy
+						echo $data["STATUS"];
+					}
+					redis_remove("$key");
+				}
+			}
+		}
+		else echo "";
+	break;
 	case "deploy":
 		if ($key=check_deploy()) { 
 			$text="A deployment has already started.<br>Please wait and do not start a new one...";
@@ -121,23 +139,6 @@ switch ($_GET["op"]) {
 		}
 		echo $text;
 	break;
-	case "check_deployment":
-		$arr = check_redis("web_out","deployment");
-		if (!empty($arr)) {
-			foreach ($arr as $key=>$data) {
-				if ($key=="deployment") {
-					if ($data["STATUS"]=="0") { // ask
-						echo base64_decode($data["TEMPLATE"]);
-					}
-					else {
-						echo $data["STATUS"];
-					}
-					redis_remove("$key");
-				}
-			}
-		}
-		else echo "";
-	break;
 	case "repositories":
 		$arr = array("STATUS" => 0);
 		$json = json_encode($arr, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT);