diff --git a/plugins/dynamix.docker.manager/DockerContainers.page b/plugins/dynamix.docker.manager/DockerContainers.page
index e28289d67..dcac595fe 100644
--- a/plugins/dynamix.docker.manager/DockerContainers.page
+++ b/plugins/dynamix.docker.manager/DockerContainers.page
@@ -62,16 +62,6 @@ th.three{width:3%}
 <script src="<?autov('/webGui/javascript/jquery.switchbutton.js')?>"></script>
 <script src="<?autov('/plugins/dynamix.docker.manager/javascript/docker.js')?>"></script>
 <script>
-function startAll() {
-  $('input[type=button]').prop('disabled',true);
-  for (var i=0,ct; ct=docker[i]; i++) if (ct.state=='false') $('#'+ct.id).find('i').addClass('fa-spin');
-  $.post('/plugins/dynamix.docker.manager/include/ContainerManager.php',{action:'start'}, function(){loadlist();});
-}
-function stopAll() {
-  $('input[type=button]').prop('disabled',true);
-  for (var i=0,ct; ct=docker[i]; i++) if (ct.state=='true') $('#'+ct.id).find('i').addClass('fa-spin');
-  $.post('/plugins/dynamix.docker.manager/include/ContainerManager.php',{action:'stop'}, function(){loadlist();});
-}
 <?if ($display['resize']):?>
 function resize(bind) {
   var width = [];
diff --git a/plugins/dynamix.docker.manager/javascript/docker.js b/plugins/dynamix.docker.manager/javascript/docker.js
index 6dd99ee81..6a5c2c67d 100644
--- a/plugins/dynamix.docker.manager/javascript/docker.js
+++ b/plugins/dynamix.docker.manager/javascript/docker.js
@@ -34,19 +34,16 @@ function addDockerContainerContext(container, image, template, started, update,
   }
   context.attach('#'+id, opts);
 }
-
 function addDockerImageContext(image, imageTag) {
   var opts = [{header:'(orphan image)'}];
   opts.push({text:"Remove", icon:"fa-trash", action:function(e){e.preventDefault(); rmImage(image, imageTag);}});
   context.attach('#context-'+image, opts);
 }
-
 function execUpContainer(container) {
   var title = "Updating the container: "+container;
   var address = "/plugins/dynamix.docker.manager/include/CreateDocker.php?updateContainer=true&ct[]="+encodeURIComponent(container);
   popupWithIframe(title, address, true);
 }
-
 function popupWithIframe(title, cmd, reload) {
   pauseEvents();
   $("#iframe-popup").html('<iframe id="myIframe" frameborder="0" scrolling="yes" width="100%" height="99%"></iframe>');
@@ -76,21 +73,18 @@ function popupWithIframe(title, cmd, reload) {
   $(".ui-dialog .ui-dialog-content").css("padding", "0");
 //$('.ui-widget-overlay').click(function() {$("#iframe-popup").dialog("close");});
 }
-
 function addContainer() {
   var path = location.pathname;
   var x = path.indexOf("?");
   if (x!=-1) path = path.substring(0,x);
   location = path+"/AddContainer";
 }
-
 function editContainer(container, template) {
   var path = location.pathname;
   var x = path.indexOf("?");
   if (x!=-1) path = path.substring(0, x);
   location = path+"/UpdateContainer?xmlTemplate=edit:"+template;
 }
-
 function updateContainer(container) {
   var body = "Update container: "+container;
   swal({
@@ -104,7 +98,6 @@ function updateContainer(container) {
     execUpContainer(container);
   });
 }
-
 function rmContainer(container, image, id) {
   var body = "Remove container: "+container+"<br><br><label><input id=\"removeimagechk\" type=\"checkbox\" checked style=\"display:inline; width:unset; height:unset; margin-top:unset; margin-bottom:unset\">also remove image</label>";
   swal({
@@ -125,7 +118,6 @@ function rmContainer(container, image, id) {
     }
   });
 }
-
 function rmImage(image, imageName) {
   var body = "Remove image: "+$('<textarea />').html(imageName).text();
   swal({
@@ -141,7 +133,6 @@ function rmImage(image, imageName) {
     eventControl({action:"remove_image", image:image});
   });
 }
-
 function eventControl(params, reload) {
   var spin = typeof reload != 'undefined';
   if (spin) $('#'+params['container']).find('i').addClass('fa-spin');
@@ -153,7 +144,16 @@ function eventControl(params, reload) {
     }
   }, "json");
 }
-
+function startAll() {
+  $('input[type=button]').prop('disabled',true);
+  for (var i=0,ct; ct=docker[i]; i++) if (ct.state=='false') $('#'+ct.id).find('i').addClass('fa-spin');
+  $.post('/plugins/dynamix.docker.manager/include/ContainerManager.php',{action:'start'}, function(){loadlist();});
+}
+function stopAll() {
+  $('input[type=button]').prop('disabled',true);
+  for (var i=0,ct; ct=docker[i]; i++) if (ct.state=='true') $('#'+ct.id).find('i').addClass('fa-spin');
+  $.post('/plugins/dynamix.docker.manager/include/ContainerManager.php',{action:'stop'}, function(){loadlist();});
+}
 function reloadUpdate() {
   $(".updatecolumn").html("<span style=\"color:#267CA8;white-space:nowrap;\"><i class=\"fa fa-spin fa-refresh\"></i> checking...</span>");
   $("#cmdStartStop").val("/plugins/dynamix.docker.manager/scripts/dockerupdate.php");
@@ -161,12 +161,10 @@ function reloadUpdate() {
   $("#cmdArg2").remove();
   $("#formStartStop").submit();
 }
-
 function autoStart(container, event) {
   document.getElementsByName("container")[0].value = container;
   $("#formStartStop").submit();
 }
-
 function containerLogs(container, id) {
   var height = 600;
   var width = 900;
diff --git a/plugins/dynamix.vm.manager/VMMachines.page b/plugins/dynamix.vm.manager/VMMachines.page
index 0f5acad40..152401536 100644
--- a/plugins/dynamix.vm.manager/VMMachines.page
+++ b/plugins/dynamix.vm.manager/VMMachines.page
@@ -122,46 +122,6 @@ th.five{width:5%}
 <script src="<?autov('/plugins/dynamix.vm.manager/javascript/dynamix.vm.manager.js')?>"></script>
 <script src="<?autov('/plugins/dynamix.vm.manager/javascript/vmmanager.js')?>"></script>
 <script>
-function startAll() {
-  $('input[type=button]').prop('disabled',true);
-  for (var i=0,vm; vm=kvm[i]; i++) if (vm.state!='running') $('#vm-'+vm.id).find('i').addClass('fa-spin');
-  $.post('/plugins/dynamix.vm.manager/include/VMManager.php',{action:'start'}, function(){loadlist();});
-}
-function stopAll() {
-  $('input[type=button]').prop('disabled',true);
-  for (var i=0,vm; vm=kvm[i]; i++) if (vm.state=='running') $('#vm-'+vm.id).find('i').addClass('fa-spin');
-  $.post('/plugins/dynamix.vm.manager/include/VMManager.php',{action:'stop'}, function(){loadlist();});
-}
-function vncOpen() {
-  $.post('/plugins/dynamix.vm.manager/include/vnc.php',{cmd:'open',root:'<?=$docroot?>',file:'<?=$docroot?>/plugins/dynamix.vm.manager/vncconnect.vnc'},function(data) {
-    window.location.href = data;
-  });
-}
-function toggle_id(itemID){
-   if ((document.getElementById(itemID).style.display == 'none')) {
-      slideDownRows($('#'+itemID));
-   } else {
-      slideUpRows($('#'+itemID));
-   }
-   return false;
-}
-function showInput(){
-  $(this).off('click');
-  $(this).siblings('input').each(function(){$(this).show();});
-  $(this).siblings('input').focus();
-  $(this).hide();
-}
-function hideInput(){
-  $(this).hide();
-  $(this).siblings('span').show();
-  $(this).siblings('span').click(showInput);
-}
-function addVM() {
-  var path = location.pathname;
-  var x = path.indexOf("?");
-  if (x!=-1) path = path.substring(0,x);
-  location = path+"/VMTemplates";
-}
 <?if ($display['resize']):?>
 function resize(bind) {
   var width = [];
diff --git a/plugins/dynamix.vm.manager/javascript/vmmanager.js b/plugins/dynamix.vm.manager/javascript/vmmanager.js
index 4519064b1..50847f99d 100644
--- a/plugins/dynamix.vm.manager/javascript/vmmanager.js
+++ b/plugins/dynamix.vm.manager/javascript/vmmanager.js
@@ -9,7 +9,6 @@ function ajaxVMDispatch(params, reload){
     }
   }, "json");
 }
-
 function addVMContext(name, uuid, template, state, vncurl, log){
   var opts = [{header:name, image:"/plugins/dynamix.vm.manager/images/dynamix.vm.manager.png"}];
   var path = location.pathname;
@@ -90,4 +89,44 @@ function addVMContext(name, uuid, template, state, vncurl, log){
     opts.push({text:"View XML", icon:"fa-code", href:path+'/UpdateVM?template=Custom&amp;uuid='+uuid});
   }
   context.attach('#vm-'+uuid, opts);
-}
\ No newline at end of file
+}
+function startAll() {
+  $('input[type=button]').prop('disabled',true);
+  for (var i=0,vm; vm=kvm[i]; i++) if (vm.state!='running') $('#vm-'+vm.id).find('i').addClass('fa-spin');
+  $.post('/plugins/dynamix.vm.manager/include/VMManager.php',{action:'start'}, function(){loadlist();});
+}
+function stopAll() {
+  $('input[type=button]').prop('disabled',true);
+  for (var i=0,vm; vm=kvm[i]; i++) if (vm.state=='running') $('#vm-'+vm.id).find('i').addClass('fa-spin');
+  $.post('/plugins/dynamix.vm.manager/include/VMManager.php',{action:'stop'}, function(){loadlist();});
+}
+function vncOpen() {
+  $.post('/plugins/dynamix.vm.manager/include/vnc.php',{cmd:'open',root:'<?=$docroot?>',file:'<?=$docroot?>/plugins/dynamix.vm.manager/vncconnect.vnc'},function(data) {
+    window.location.href = data;
+  });
+}
+function toggle_id(itemID){
+   if ((document.getElementById(itemID).style.display == 'none')) {
+      slideDownRows($('#'+itemID));
+   } else {
+      slideUpRows($('#'+itemID));
+   }
+   return false;
+}
+function showInput(){
+  $(this).off('click');
+  $(this).siblings('input').each(function(){$(this).show();});
+  $(this).siblings('input').focus();
+  $(this).hide();
+}
+function hideInput(){
+  $(this).hide();
+  $(this).siblings('span').show();
+  $(this).siblings('span').click(showInput);
+}
+function addVM() {
+  var path = location.pathname;
+  var x = path.indexOf("?");
+  if (x!=-1) path = path.substring(0,x);
+  location = path+"/VMTemplates";
+}