diff --git a/www/comps/admin/adminLogin.js b/www/comps/admin/adminLogin.js
index 5a0974ad..c0f18666 100644
--- a/www/comps/admin/adminLogin.js
+++ b/www/comps/admin/adminLogin.js
@@ -42,7 +42,7 @@ let MyAdminLogin = {
 		MyInputSelect,
 		MyTabs
 	},
-	template:`<div class="app-sub-window under-header at-top" @mousedown.self="$emit('close')">
+	template:`<div class="app-sub-window under-header at-top with-margin" @mousedown.self="$emit('close')">
 		
 		<!-- login record form -->
 		<div class="app-sub-window under-header"
@@ -62,7 +62,7 @@ let MyAdminLogin = {
 			/>
 		</div>
 		
-		<div class="contentBox admin-login pop-up" v-if="inputsReady">
+		<div class="contentBox admin-login popUp" v-if="inputsReady">
 			<div class="top">
 				<div class="area nowrap">
 					<img class="icon" src="images/person.png" />
diff --git a/www/comps/admin/adminLoginTemplate.js b/www/comps/admin/adminLoginTemplate.js
index ca63fa47..7b63b591 100644
--- a/www/comps/admin/adminLoginTemplate.js
+++ b/www/comps/admin/adminLoginTemplate.js
@@ -2,9 +2,9 @@ export {MyAdminLoginTemplate as default};
 
 let MyAdminLoginTemplate = {
 	name:'my-admin-login-template',
-	template:`<div class="app-sub-window under-header at-top" @mousedown.self="$emit('close')">
+	template:`<div class="app-sub-window under-header at-top with-margin" @mousedown.self="$emit('close')">
 		
-		<div class="contentBox admin-login-template pop-up" v-if="inputsReady">
+		<div class="contentBox admin-login-template popUp" v-if="inputsReady">
 			<div class="top">
 				<div class="area nowrap">
 					<img class="icon" src="images/personTemplate.png" />
diff --git a/www/comps/admin/adminModules.js b/www/comps/admin/adminModules.js
index 674eb7be..614e831d 100644
--- a/www/comps/admin/adminModules.js
+++ b/www/comps/admin/adminModules.js
@@ -355,7 +355,7 @@ let MyAdminModules = {
 		
 		<!-- application help window -->
 		<div class="app-sub-window under-header" v-if="moduleIdShowHelp !== null" @mousedown.self="moduleIdShowHelp = null">
-			<my-articles class="admin-modules-help shade pop-up"
+			<my-articles class="admin-modules-help shade popUp"
 				@close="moduleIdShowHelp = null"
 				:moduleId="moduleIdShowHelp"
 				:isPopUp="false"
diff --git a/www/comps/app.css b/www/comps/app.css
index 7e8f6989..537a725e 100644
--- a/www/comps/app.css
+++ b/www/comps/app.css
@@ -396,6 +396,9 @@ h3{
 .app-sub-window.at-top{
 	justify-content:flex-start;
 }
+.app-sub-window.at-top.with-margin{
+	top:var(--spacing);
+}
 .app-sub-window.no-scroll{
 	overflow:hidden;
 }
diff --git a/www/comps/articles.js b/www/comps/articles.js
index 0ae4511a..ed5e04e3 100644
--- a/www/comps/articles.js
+++ b/www/comps/articles.js
@@ -7,7 +7,7 @@ export {MyArticles as default};
 let MyArticles = {
 	name:'my-articles',
 	components:{ MyTabs },
-	template:`<div class="contentBox" :class="{ large:showLarge || isMobile, 'pop-up':isPopUp }">
+	template:`<div class="contentBox" :class="{ large:showLarge || isMobile, 'popUp':isPopUp }">
 		<div class="top lower">
 			<div class="area">
 				<img class="icon" src="images/question.png" />
diff --git a/www/comps/builder/builderArticles.js b/www/comps/builder/builderArticles.js
index 4cb11ffa..6edbd3fd 100644
--- a/www/comps/builder/builderArticles.js
+++ b/www/comps/builder/builderArticles.js
@@ -49,7 +49,7 @@ let MyBuilderArticlesItem = {
 			<td>
 				<!-- article body pop up window -->
 				<div class="app-sub-window under-header" v-if="showContent" @mousedown.self="showContent = false">
-					<div class="contentBox builder-articles-body shade pop-up">
+					<div class="contentBox builder-articles-body shade popUp">
 						<div class="top lower">
 							<div class="area">
 								<img class="icon" src="images/question.png" />
@@ -336,7 +336,7 @@ let MyBuilderArticles = {
 			
 			<!-- articles preview -->
 			<div class="app-sub-window under-header" v-if="showPreview" @mousedown.self="showPreview = false">
-				<my-articles class="builder-articles-preview shade pop-up"
+				<my-articles class="builder-articles-preview shade popUp"
 					@close="showPreview = false"
 					:form="formIdAssignTo !== null ? formIdMap[formIdAssignTo] : null"
 					:isPopUp="false"
diff --git a/www/comps/builder/builderAttribute.js b/www/comps/builder/builderAttribute.js
index b5567bae..3f78c0ca 100644
--- a/www/comps/builder/builderAttribute.js
+++ b/www/comps/builder/builderAttribute.js
@@ -25,7 +25,7 @@ let MyBuilderAttribute = {
 		MyBuilderIconInput
 	},
 	template:`<div class="app-sub-window under-header" @mousedown.self="$emit('close')">
-		<div class="contentBox builder-attribute pop-up" v-if="values !== null">
+		<div class="contentBox builder-attribute popUp" v-if="values !== null">
 			<div class="top">
 				<div class="area nowrap">
 					<img class="icon" :src="'images/'+getAttributeIcon(values,false,false)" />
diff --git a/www/comps/builder/builderIconInput.js b/www/comps/builder/builderIconInput.js
index bf954f95..0163b14a 100644
--- a/www/comps/builder/builderIconInput.js
+++ b/www/comps/builder/builderIconInput.js
@@ -34,7 +34,7 @@ let MyBuilderIconInput = {
 		
 		<div class="app-sub-window" v-if="showInput && iconIdMap !== null" @click.self="close">
 			<div class="build-icon-input-window">
-				<div class="contentBox pop-up">
+				<div class="contentBox popUp">
 					<div class="top lower">
 						<div class="area">
 							<h1 class="title">{{ capGen.icon }}</h1>
diff --git a/www/comps/builder/builderMenu.js b/www/comps/builder/builderMenu.js
index a98dd669..90413b55 100644
--- a/www/comps/builder/builderMenu.js
+++ b/www/comps/builder/builderMenu.js
@@ -73,7 +73,7 @@ let MyBuilderMenuItems = {
 					v-if="showCollectionsIndex === index"
 					@mousedown.self="showCollectionsIndex = -1"
 				>
-					<div class="contentBox builder-new pop-up">
+					<div class="contentBox builder-new popUp">
 						<div class="top lower">
 							<div class="area nowrap">
 								<h1 class="title">{{ capApp.collections }}</h1>
diff --git a/www/comps/builder/builderNew.js b/www/comps/builder/builderNew.js
index 1f30bfa6..3555174d 100644
--- a/www/comps/builder/builderNew.js
+++ b/www/comps/builder/builderNew.js
@@ -10,7 +10,7 @@ export {MyBuilderNew as default};
 let MyBuilderNew = {
 	name:'my-builder-new',
 	template:`<div class="app-sub-window under-header" @mousedown.self="$emit('close')">
-		<div class="contentBox builder-new pop-up">
+		<div class="contentBox builder-new popUp">
 			<div class="top lower">
 				<div class="area nowrap">
 					<img class="icon" :src="titleImgSrc" />
diff --git a/www/comps/builder/builderPgIndex.js b/www/comps/builder/builderPgIndex.js
index adbc8dec..2024ef18 100644
--- a/www/comps/builder/builderPgIndex.js
+++ b/www/comps/builder/builderPgIndex.js
@@ -3,7 +3,7 @@ export {MyBuilderPgIndex as default};
 let MyBuilderPgIndex = {
 	name:'my-builder-pg-index',
 	template:`<div class="app-sub-window under-header" @mousedown.self="$emit('close')">
-		<div class="contentBox builder-pg-index pop-up" v-if="values !== null">
+		<div class="contentBox builder-pg-index popUp" v-if="values !== null">
 			<div class="top">
 				<div class="area nowrap">
 					<img class="icon" src="images/databaseAsterisk.png" />
diff --git a/www/comps/formLog.js b/www/comps/formLog.js
index 645ef955..b0e0464e 100644
--- a/www/comps/formLog.js
+++ b/www/comps/formLog.js
@@ -15,7 +15,7 @@ export {MyFormLog as default};
 let MyFormLog = {
 	name:'my-form-log',
 	components:{MyField},
-	template:`<div class="form-log contentBox" :class="{ 'pop-up':isPopUp }">
+	template:`<div class="form-log contentBox" :class="{ 'popUp':isPopUp }">
 		<div class="top">
 			<div class="area">
 				<img class="icon" src="images/time.png" />
diff --git a/www/comps/settings.js b/www/comps/settings.js
index c5594ae5..20179403 100644
--- a/www/comps/settings.js
+++ b/www/comps/settings.js
@@ -605,7 +605,7 @@ let MySettingsFixedTokens = {
 		
 		<!-- MFA sub window -->
 		<div class="app-sub-window" v-if="showMfa">
-			<div class="contentBox pop-up settings-mfa">
+			<div class="contentBox popUp settings-mfa">
 				<div class="top lower">
 					<div class="area">
 						<img class="icon" src="images/smartphone.png" />
@@ -670,7 +670,7 @@ let MySettingsFixedTokens = {
 		
 		<!-- device install sub window -->
 		<div class="app-sub-window" v-if="showInstall">
-			<div class="contentBox pop-up">
+			<div class="contentBox popUp">
 				<div class="top lower">
 					<div class="area">
 						<img class="icon" src="images/screen.png" />