diff --git a/meshcentral.js b/meshcentral.js
index 016bf177..2f30771f 100644
--- a/meshcentral.js
+++ b/meshcentral.js
@@ -155,7 +155,7 @@ function CreateMeshCentralServer(config, args) {
                 var arg = process.argv[i];
                 if (arg.length > 0) {
                     if (startLine.length > 0) startLine += ' ';
-                    if (arg.indexOf(' ') >= 0) { startLine += '"' + arg + '"'; } else { startLine += arg; }
+                    if ((arg.indexOf(' ') >= 0) || (arg.indexOf('&') >= 0)) { startLine += '"' + arg + '"'; } else { startLine += arg; }
                 }
             }
             obj.launchChildServer(startLine);
diff --git a/package.json b/package.json
index 99dc688c..23588332 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meshcentral",
-  "version": "0.3.2-t",
+  "version": "0.3.2-u",
   "keywords": [
     "Remote Management",
     "Intel AMT",
diff --git a/public/styles/style.css b/public/styles/style.css
index dbc927de..d2db8197 100644
--- a/public/styles/style.css
+++ b/public/styles/style.css
@@ -2075,11 +2075,15 @@ a {
 
 #p14iframe {
     width: 100%;
-    height: calc(100vh - 232px);
+    height: calc(100vh - 218px);
     border: 0;
     overflow: hidden;
 }
 
+.menu_stack #p14iframe {
+    height: calc(100vh - 246px);
+}
+
 .fulldesk #p14iframe {
     height: calc(100vh - 65px);
 }