diff --git a/customize.dist/src/less2/include/creation.less b/customize.dist/src/less2/include/creation.less
index 5dbce1046..f61f20d90 100644
--- a/customize.dist/src/less2/include/creation.less
+++ b/customize.dist/src/less2/include/creation.less
@@ -69,7 +69,7 @@
         outline: none;
         width: 700px;
         max-width: 90vw;
-        height: 500px;
+        //height: 500px;
         border-radius: @variables_radius_L;
         max-height: ~"calc(100vh - 20px)";
         margin: 0px;
@@ -85,6 +85,7 @@
         }
 
         .cp-creation-checkboxes {
+            min-width: 300px;
             flex-flow: column;
             align-items: baseline !important;
             max-height: 150px;
@@ -156,7 +157,7 @@
             flex: 1 0 auto;
             justify-content: space-around;
             & > div {
-                width: 300px;
+                //width: 300px;
                 max-width: 100%;
                 display: flex;
                 align-items: center;
@@ -291,11 +292,11 @@
                         }
                     }
                 }
-                .cp-creation-password-warning {
-                    margin-top: 0.4rem;
-                    font-size: 0.75em;
-                    line-height: 120%;
-                }
+            }
+            .cp-creation-password-warning {
+                font-size: 0.75em;
+                line-height: 120%;
+                margin: 0.4rem 1rem calc(0.4rem + 6px);
             }
             .cp-creation-settings {
                 button {
@@ -425,7 +426,6 @@
             #cp-creation-form {
                 & > div {
                     width: 95%;
-                    margin: 0 auto;
                 }
                 .cp-creation-expire {
                     &.active {
@@ -435,7 +435,6 @@
                         .cp-creation-slider {
                             flex: none;
                             order: 10;
-                            width: 100%;
                         }
                     }
                 }
@@ -444,7 +443,7 @@
     }
     @media screen and (max-width: 800px) {
         #cp-creation {
-            height: 550px;
+            //height: 550px;
             #cp-creation-form {
                 div.cp-creation-template {
                     flex-flow: column;
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index c2dc088fc..da840dfc4 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -2782,7 +2782,6 @@ define([
                     type: "text" // TODO type password with click to show
                 }),*/
             ]),
-            text,
             //createHelper('#', "TODO: password protection adds another layer of security ........") // TODO
         ]);
 
@@ -2813,6 +2812,7 @@ define([
                 expire,
                 password,
             ]),
+            text,
             templates,
             createDiv
         ])).appendTo($creation);