diff --git a/gui/app/pods/auth/share/template.hbs b/gui/app/pods/auth/share/template.hbs
index 947ad643..504a7b59 100644
--- a/gui/app/pods/auth/share/template.hbs
+++ b/gui/app/pods/auth/share/template.hbs
@@ -1,5 +1,5 @@
 {{#layout/master-sidebar hideNavigation=true}}
-	<Ui::UiSpacer @size=300 />
+	<Ui::UiSpacer @size="300" />
 	<div class="section">
 		<div class="title">welcome to documize</div>
 		<p>Let's set up your account and you started</p>
diff --git a/gui/app/pods/document/index/template.hbs b/gui/app/pods/document/index/template.hbs
index 8e451538..98b4a04b 100644
--- a/gui/app/pods/document/index/template.hbs
+++ b/gui/app/pods/document/index/template.hbs
@@ -1,7 +1,7 @@
 <Layout::MasterNavigation />
 <Layout::MasterToolbar>
 	<div class="zone-1">
-		<Document::DocumentsList @space={{folder}} @docId=document.id />
+		<Document::DocumentsList @space={{folder}} @docId={{document.id}} />
 	</div>
 	<div class="zone-2" />
 	<div class="zone-3">
@@ -39,7 +39,7 @@
 				</div>
 			</div>
 
-			<Ui::UiSpacer @size=200 />
+			<Ui::UiSpacer @size="200" />
 
 			{{#if (eq sidebarTab "toc")}}
 				{{document/sidebar-toc
@@ -95,7 +95,7 @@
 			approvalStatus=approvalStatus}}
 
 		{{#if contributionStatus}}
-			<Ui::UiSpacer @size=200 />
+			<Ui::UiSpacer @size="200" />
 			<div class="document-meta">
 				<div class="label-workflow-status">
 					{{contributionStatus}}
@@ -103,7 +103,7 @@
 			</div>
 		{{else}}
 			{{#if approvalStatus}}
-				<Ui::UiSpacer @size=200 />
+				<Ui::UiSpacer @size="200" />
 				<div class="document-meta">
 					<div class="label-workflow-status">
 						{{approvalStatus}}
@@ -112,7 +112,7 @@
 			{{/if}}
 		{{/if}}
 
-		<Ui::UiSpacer @size=300 />
+		<Ui::UiSpacer @size="300" />
 
 		<div class="document-meta {{if permissions.documentEdit "cursor-pointer"}}" {{action "onEditMeta"}}>
 			<div class="document-heading">
diff --git a/gui/app/pods/folder/index/template.hbs b/gui/app/pods/folder/index/template.hbs
index b7af8aad..2e824269 100644
--- a/gui/app/pods/folder/index/template.hbs
+++ b/gui/app/pods/folder/index/template.hbs
@@ -46,7 +46,7 @@
 		{{else}}
 			<div class="space-label" style={{{model.label.bgColor}}}>{{model.label.name}}</div>
 			<i class="space-label-dropdown dicon {{constants.Icon.ArrowSmallDown}}">
-				{{#attach-popover class="ember-attacher-popper" hideOn="clickout" showOn="click" isShown=false placement="bottom-middle"}}
+				{{#attach-popover class="ember-attacher-popper" hideOn="click clickout" showOn="click" isShown=false placement="bottom-middle"}}
 					<ul class="menu">
 						{{#each model.folders as |space|}}
 							{{#if (eq space.labelId model.label.id)}}
diff --git a/gui/app/pods/folders/template.hbs b/gui/app/pods/folders/template.hbs
index 4e5c8bfd..039cbda1 100644
--- a/gui/app/pods/folders/template.hbs
+++ b/gui/app/pods/folders/template.hbs
@@ -46,7 +46,7 @@
 				</div>
 			</div>
 
-			<Ui::UiSpacer @size=300 />
+			<Ui::UiSpacer @size="300" />
 
 			<div class="section">
 				<div class="title">label</div>
diff --git a/gui/app/pods/search/template.hbs b/gui/app/pods/search/template.hbs
index 5d404e20..244351fe 100644
--- a/gui/app/pods/search/template.hbs
+++ b/gui/app/pods/search/template.hbs
@@ -25,7 +25,7 @@
 					</div>
 				</div>
 			</div>
-			<Ui::UiSpacer @size=200 />
+			<Ui::UiSpacer @size="200" />
 			<div class="section">
 				<div class="title">query examples</div>
 				<div class="view-search">
diff --git a/gui/app/styles/core/ui/ui-popup.scss b/gui/app/styles/core/ui/ui-popup.scss
index 87d5350e..edce1bdc 100644
--- a/gui/app/styles/core/ui/ui-popup.scss
+++ b/gui/app/styles/core/ui/ui-popup.scss
@@ -19,6 +19,9 @@
 		margin: 0;
 		padding: 0;
 		min-width: 140px;
+		max-height: calc(100vh - 200px);
+		overflow: hidden;
+		overflow-y: auto;
 
 		> .item {
 			color: map-get($gray-shades, 800);
diff --git a/gui/app/templates/components/customize/auth-settings.hbs b/gui/app/templates/components/customize/auth-settings.hbs
index 96b0795b..5055159e 100644
--- a/gui/app/templates/components/customize/auth-settings.hbs
+++ b/gui/app/templates/components/customize/auth-settings.hbs
@@ -26,7 +26,7 @@
 			</ul>
 		</div>
 
-		<Ui::UiSpacer @size=300 />
+		<Ui::UiSpacer @size="300" />
 
 		{{#if isKeycloakProvider}}
 			<div class="form-group">
diff --git a/gui/app/templates/components/customize/change-log.hbs b/gui/app/templates/components/customize/change-log.hbs
index e2fa0d84..ac647aba 100644
--- a/gui/app/templates/components/customize/change-log.hbs
+++ b/gui/app/templates/components/customize/change-log.hbs
@@ -26,7 +26,7 @@
 			</small>
 		</div>
 	</div>
-	<Ui::UiSpacer @size=400 />
+	<Ui::UiSpacer @size="400" />
 	<div class="change-log">
 		{{{changelog}}}
 	</div>
diff --git a/gui/app/templates/components/customize/license-key.hbs b/gui/app/templates/components/customize/license-key.hbs
index 9ff72774..a46ce35f 100644
--- a/gui/app/templates/components/customize/license-key.hbs
+++ b/gui/app/templates/components/customize/license-key.hbs
@@ -29,7 +29,7 @@
 			{{ui/ui-button color=constants.Color.Yellow light=true label="Upgrade"}}
 		</a>
 	{{/if}}
-	<Ui::UiSpacer @size=400 />
+	<Ui::UiSpacer @size="400" />
 
 	<form>
 		<div class="form-group">
@@ -101,7 +101,7 @@
 
 {{#if (eq appMeta.edition constants.Product.EnterpriseEdition)}}
 	{{#if (eq appMeta.location "cloud")}}
-		<Ui::UiSpacer @size=400 />
+		<Ui::UiSpacer @size="400" />
 		<div class="view-customize">
 			<div class="deactivation-zone">
 				<p>Let us know if you would like to close your account or cancel your subscription.</p>
diff --git a/gui/app/templates/components/customize/space-admin.hbs b/gui/app/templates/components/customize/space-admin.hbs
index d9a27a0e..9eb7356a 100644
--- a/gui/app/templates/components/customize/space-admin.hbs
+++ b/gui/app/templates/components/customize/space-admin.hbs
@@ -1,6 +1,6 @@
 {{#if spaces}}
 	{{ui/ui-button color=constants.Color.Yellow light=true icon=constants.Icon.Export label="Export All Content" onClick=(action "onExport")}}
-	<Ui::UiSpacer @size=300 />
+	<Ui::UiSpacer @size="300" />
 
 	<div class="view-customize">
 		<ul class="space-list">
@@ -28,7 +28,7 @@
 							</div>
 							<div class="desc">Some description that is to be wired up to the backend</div>
 						{{/link-to}}
-						<Ui::UiSpacer @size=200 />
+						<Ui::UiSpacer @size="200" />
 						{{#ui/ui-toolbar dark=false light=true raised=true large=false bordered=true}}
 							{{ui/ui-toolbar-icon icon=constants.Icon.AddUser color=constants.Color.Green tooltip="Add myself as owner" onClick=(action "onOwner" space.id)}}
 							{{ui/ui-toolbar-icon icon=constants.Icon.Delete color=constants.Color.Red tooltip="Delete space" onClick=(action "onShow" space.id)}}
diff --git a/gui/app/templates/components/customize/space-labels.hbs b/gui/app/templates/components/customize/space-labels.hbs
index 9165aa3f..63c41519 100644
--- a/gui/app/templates/components/customize/space-labels.hbs
+++ b/gui/app/templates/components/customize/space-labels.hbs
@@ -6,7 +6,7 @@
 		label=constants.Label.Add
 		onClick=(action "onShowAddModal")}}
 
-	<Ui::UiSpacer @size=300 />
+	<Ui::UiSpacer @size="300" />
 
 	<ul class="space-labels">
 		{{#each labels as |label|}}
diff --git a/gui/app/templates/components/customize/user-admin.hbs b/gui/app/templates/components/customize/user-admin.hbs
index c7c63367..e68e5f34 100644
--- a/gui/app/templates/components/customize/user-admin.hbs
+++ b/gui/app/templates/components/customize/user-admin.hbs
@@ -21,9 +21,9 @@
 									{{input id="newUserEmail" type="email" class="form-control" placeholder="Email" value=newUser.email}}
 								</div>
 							</div>
-							<Ui::UiSpacer @size=200 />
+							<Ui::UiSpacer @size="200" />
 							{{ui/ui-button color=constants.Color.Green icon=constants.Icon.Person light=true label=constants.Label.Add onClick=(action "onAddUser")}}
-							<Ui::UiSpacer @size=300 />
+							<Ui::UiSpacer @size="300" />
 						</form>
 						<form onsubmit={{action "onAddUser"}}>
 							<div class="form-group">
diff --git a/gui/app/templates/components/customize/user-groups.hbs b/gui/app/templates/components/customize/user-groups.hbs
index 7232059b..e8625769 100644
--- a/gui/app/templates/components/customize/user-groups.hbs
+++ b/gui/app/templates/components/customize/user-groups.hbs
@@ -26,7 +26,7 @@
 		</div>
 	</div>
 
-	<Ui::UiSpacer @size=300 />
+	<Ui::UiSpacer @size="300" />
 
 	<div class="groups-list">
 		{{#each groups as |group|}}
@@ -35,7 +35,7 @@
 					{{group.name}} ({{group.members}})
 				</div>
 				<div class="desc">{{group.purpose}}</div>
-				<Ui::UiSpacer @size=200 />
+				<Ui::UiSpacer @size="200" />
 				{{#ui/ui-toolbar dark=false light=true raised=true large=false bordered=true}}
 					{{ui/ui-toolbar-icon icon=constants.Icon.AddUser color=constants.Color.Gray tooltip="Add members" onClick=(action "onShowAddMemberModal" group.id)}}
 					{{#if (gt group.members 0)}}
@@ -146,7 +146,7 @@
 								{{ui/ui-toolbar-label color=constants.Color.Gray label="ALL" selected=(eq userLimit 99999) onClick=(action "onLimit" 99999)}}
 							{{/ui/ui-toolbar}}
 						</div>
-						<Ui::UiSpacer @size=300 />
+						<Ui::UiSpacer @size="300" />
 						<div class="group-users-members">
 							{{#each users as |user|}}
 								<div class="item">
diff --git a/gui/app/templates/components/customize/user-list.hbs b/gui/app/templates/components/customize/user-list.hbs
index eaf0f5d0..5c9e806d 100644
--- a/gui/app/templates/components/customize/user-list.hbs
+++ b/gui/app/templates/components/customize/user-list.hbs
@@ -1,6 +1,6 @@
 <div class="view-customize">
 	{{#if isAuthProviderKeycloak}}
-		<Ui::UiSpacer @size=300 />
+		<Ui::UiSpacer @size="300" />
 		{{#if syncInProgress}}
 			{{ui/ui-button color=constants.Color.Gray light=true icon=constants.Icon.Locked label="Keycloak user sync running..."}}
 		{{else}}
@@ -9,7 +9,7 @@
 	{{/if}}
 
 	{{#if (or isAuthProviderLDAP c)}}
-		<Ui::UiSpacer @size=300 />
+		<Ui::UiSpacer @size="300" />
 		{{#if syncInProgress}}
 			{{ui/ui-button color=constants.Color.Gray light=true icon=constants.Icon.Locked label="LDAP user sync running..."}}
 		{{else}}
@@ -17,7 +17,7 @@
 		{{/if}}
 	{{/if}}
 
-	<Ui::UiSpacer @size=300 />
+	<Ui::UiSpacer @size="300" />
 	<div class="explain-user-perms">
 		<div class="title" {{action "togglePerms"}}>
 			Permissions Explained
@@ -40,7 +40,7 @@
 			<div class="perm-desc">Can login and use Documize</div>
 		</div>
 	</div>
-	<Ui::UiSpacer @size=300 />
+	<Ui::UiSpacer @size="300" />
 
 	<div class="form-group">
 		{{focus-input type="text" class="form-control" placeholder="filter users" value=filter key-up=(action "onFilterChange")}}
diff --git a/gui/app/templates/components/document/document-meta.hbs b/gui/app/templates/components/document/document-meta.hbs
index adfacb9c..f38e1bd3 100644
--- a/gui/app/templates/components/document/document-meta.hbs
+++ b/gui/app/templates/components/document/document-meta.hbs
@@ -1,4 +1,4 @@
-<Ui::UiSpacer @size=300 />
+<Ui::UiSpacer @size="300" />
 
 <div class="document-meta">
 	<div class="title {{if permissions.documentEdit "cursor-pointer"}}" {{action "onEditCategory"}}>CATEGORY / TAG</div>
diff --git a/gui/app/templates/components/document/document-toolbar.hbs b/gui/app/templates/components/document/document-toolbar.hbs
index c4f92ac0..0f583c4c 100644
--- a/gui/app/templates/components/document/document-toolbar.hbs
+++ b/gui/app/templates/components/document/document-toolbar.hbs
@@ -2,7 +2,7 @@
 	{{#if (eq appMeta.edition constants.Product.EnterpriseEdition)}}
 		{{#if permissions.documentEdit}}
 			{{#ui/ui-toolbar-dropdown label="Actions" arrow=true}}
-				{{#attach-popover class="ember-attacher-popper" hideOn="clickout" showOn="click" isShown=false}}
+				{{#attach-popover class="ember-attacher-popper" hideOn="click clickout" showOn="click" isShown=false}}
 					<ul class="menu">
 						<li class="item" {{action "onShowRequestContributionModal"}}>Request contribution</li>
 						<li class="item" {{action "onShowRequestFeedbackModal"}}>Request feedback</li>
@@ -20,7 +20,7 @@
 	{{/if}}
 
 	{{#ui/ui-toolbar-dropdown label="Content" arrow=true}}
-		{{#attach-popover class="ember-attacher-popper" hideOn="clickout" showOn="click" isShown=false}}
+		{{#attach-popover class="ember-attacher-popper" hideOn="click clickout" showOn="click" isShown=false}}
 			<ul class="menu">
 				{{#if pinState.isPinned}}
 					<li class="item" {{action "onUnpin"}}>Remove bookmark</li>
@@ -47,7 +47,7 @@
 
 	{{#if (or showActivity showRevisions)}}
 		{{#ui/ui-toolbar-dropdown label="History" arrow=true}}
-			{{#attach-popover class="ember-attacher-popper" hideOn="clickout" showOn="click" isShown=false}}
+			{{#attach-popover class="ember-attacher-popper" hideOn="click clickout" showOn="click" isShown=false}}
 				<ul class="menu">
 					{{#if showActivity}}
 						{{#link-to "document.activity" class="item"}}Activity summary{{/link-to}}
diff --git a/gui/app/templates/components/document/documents-list.hbs b/gui/app/templates/components/document/documents-list.hbs
index 018fb2cf..312cb049 100644
--- a/gui/app/templates/components/document/documents-list.hbs
+++ b/gui/app/templates/components/document/documents-list.hbs
@@ -3,7 +3,7 @@
 		icon=constants.Icon.ArrowLeft label=space.name onClick=(action "onSpace")}}
 	{{#if docs}}
 		{{#ui/ui-toolbar-icon icon=constants.Icon.ArrowSmallDown}}
-			{{#attach-popover class="ember-attacher-popper" hideOn="clickout" showOn="click" isShown=false placement="bottom-middle"}}
+			{{#attach-popover class="ember-attacher-popper" hideOn="click clickout" showOn="click" isShown=false placement="bottom-middle" }}
 				<ul class="menu">
 					{{#each docs as |doc|}}
 						{{#if (not-eq doc.id docId)}}
diff --git a/gui/app/templates/components/document/page-heading.hbs b/gui/app/templates/components/document/page-heading.hbs
index f224d6e9..c925c052 100644
--- a/gui/app/templates/components/document/page-heading.hbs
+++ b/gui/app/templates/components/document/page-heading.hbs
@@ -73,7 +73,7 @@
 						<label>Destination Document</label>
 						{{focus-input type="text" value=docSearchFilter class="form-control" placeholder="a OR b, x AND y, 'phrase mat*'"}}
 					</div>
-					<Ui::UiSpacer @size=100 />
+					<Ui::UiSpacer @size="100" />
 					<div class="document-copy-move">
 						{{#if emptySearch}}
 							<p>No matching documents found.</p>
diff --git a/gui/app/templates/components/document/section-attachment.hbs b/gui/app/templates/components/document/section-attachment.hbs
index e331b029..8e71ad86 100644
--- a/gui/app/templates/components/document/section-attachment.hbs
+++ b/gui/app/templates/components/document/section-attachment.hbs
@@ -1,5 +1,5 @@
 {{#if editMode}}
-	<Ui::UiSpacer @size=200 />
+	<Ui::UiSpacer @size="200" />
 	{{ui/ui-button color=constants.Color.Gray label=uploadLabel id=uploadId}}
 {{/if}}
 
@@ -17,7 +17,7 @@
 								{{#attach-popover class="ember-attacher-popper" hideOn="escapekey, clickout" showOn="click" isShown=false}}
 									<div class="form">
 										<p>Are you sure you want to delete this file?</p>
-										<Ui::UiSpacer @size=100 />
+										<Ui::UiSpacer @size="100" />
 										{{ui/ui-button
 											light=false
 											label=constants.Label.Delete
diff --git a/gui/app/templates/components/document/settings-category.hbs b/gui/app/templates/components/document/settings-category.hbs
index f0c6614c..a4a9ce8d 100644
--- a/gui/app/templates/components/document/settings-category.hbs
+++ b/gui/app/templates/components/document/settings-category.hbs
@@ -6,7 +6,7 @@
 {{#if categories}}
 	{{ui/ui-list-picker items=categories nameField="category" singleSelect=false}}
 
-	<Ui::UiSpacer @size=300 />
+	<Ui::UiSpacer @size="300" />
 
 	{{ui/ui-button
 		color=constants.Color.Green
diff --git a/gui/app/templates/components/document/settings-tag.hbs b/gui/app/templates/components/document/settings-tag.hbs
index e7264f31..cbc7c376 100644
--- a/gui/app/templates/components/document/settings-tag.hbs
+++ b/gui/app/templates/components/document/settings-tag.hbs
@@ -12,10 +12,10 @@
 		</div>
 		{{input type="text" id=(concat "add-tag-field-" tag.number) class="form-control mousetrap tag-input" placeholder="Tag name" value=tag.value}}
 	</div>
-	<Ui::UiSpacer @size=200 />
+	<Ui::UiSpacer @size="200" />
 {{/each}}
 
-<Ui::UiSpacer @size=300 />
+<Ui::UiSpacer @size="300" />
 
 {{ui/ui-button
 	color=constants.Color.Green
diff --git a/gui/app/templates/components/document/sidebar-attachment.hbs b/gui/app/templates/components/document/sidebar-attachment.hbs
index be004859..b1a4766e 100644
--- a/gui/app/templates/components/document/sidebar-attachment.hbs
+++ b/gui/app/templates/components/document/sidebar-attachment.hbs
@@ -1,9 +1,9 @@
 <div class="title center">attachments</div>
 {{#if canEdit}}
 	<div class="text-center">
-		<Ui::UiSpacer @size=100 />
+		<Ui::UiSpacer @size="100" />
 		{{ui/ui-button color=constants.Color.Gray label="Upload" id="upload-document-files"}}
-		<Ui::UiSpacer @size=100 />
+		<Ui::UiSpacer @size="100" />
 	</div>
 {{/if}}
 
@@ -23,7 +23,7 @@
 										{{#attach-popover class="ember-attacher-popper" hideOn="escapekey, clickout" showOn="click" isShown=false}}
 											<div class="form">
 												<p>Are you sure you want to delete this file?</p>
-												<Ui::UiSpacer @size=100 />
+												<Ui::UiSpacer @size="100" />
 												{{ui/ui-button
 													light=false
 													label=constants.Label.Delete
diff --git a/gui/app/templates/components/document/sidebar-meta.hbs b/gui/app/templates/components/document/sidebar-meta.hbs
index fa664c7b..dfdd408e 100644
--- a/gui/app/templates/components/document/sidebar-meta.hbs
+++ b/gui/app/templates/components/document/sidebar-meta.hbs
@@ -4,7 +4,7 @@
 		{{#if (gt versions.length 0)}}
 			{{#ui/ui-toolbar dark=false light=true raised=true large=false bordered=true}}
 				{{ui/ui-toolbar-label label=document.versionId color=constants.Color.Gray}}
-				{{#attach-popover class="ember-attacher-popper" hideOn="clickout" showOn="click" isShown=false}}
+				{{#attach-popover class="ember-attacher-popper" hideOn="click clickout" showOn="click" isShown=false}}
 					<div class="menu">
 						<li class="item header">Select version to view</li>
 						{{#each versions as |version|}}
@@ -23,7 +23,7 @@
 			{{/if}}
 		{{/if}}
 
-		<Ui::UiSpacer @size=200 />
+		<Ui::UiSpacer @size="200" />
 	{{/if}}
 
 	<div class="title {{if permissions.documentEdit "cursor-pointer"}}" {{action "onEditStatus"}}>STATUS</div>
diff --git a/gui/app/templates/components/document/sidebar-toc.hbs b/gui/app/templates/components/document/sidebar-toc.hbs
index 6ce15fb8..ac353486 100644
--- a/gui/app/templates/components/document/sidebar-toc.hbs
+++ b/gui/app/templates/components/document/sidebar-toc.hbs
@@ -17,7 +17,7 @@
 		</div>
 	</div>
 {{else}}
-	<Ui::UiSpacer @size=100 />
+	<Ui::UiSpacer @size="100" />
 {{/if}}
 
 <div class="document-sidebar-toc">
diff --git a/gui/app/templates/components/document/view-content.hbs b/gui/app/templates/components/document/view-content.hbs
index a40911b6..ee04c2cb 100644
--- a/gui/app/templates/components/document/view-content.hbs
+++ b/gui/app/templates/components/document/view-content.hbs
@@ -1,6 +1,6 @@
 {{#if hasPages}}
 	{{#each pages key="id" as |item|}}
-		<Ui::UiSpacer @size=100 />
+		<Ui::UiSpacer @size="100" />
 		{{document/document-page
 			roles=roles
 			pages=pages
@@ -41,7 +41,7 @@
 			<div class="thanks">Thanks for the feedback!</div>
 		{{else}}
 			<div class="prompt">{{folder.likes}}</div>
-			<Ui::UiSpacer @size=200 />
+			<Ui::UiSpacer @size="200" />
 			<div class="buttons">
 				{{ui/ui-button color=constants.Color.Yellow light=true label="Yes, thanks!" onClick=(action "onVote" 1)}}
 				{{ui/ui-button-gap}}
diff --git a/gui/app/templates/components/document/view-revision.hbs b/gui/app/templates/components/document/view-revision.hbs
index 5a42358f..6304d99f 100644
--- a/gui/app/templates/components/document/view-revision.hbs
+++ b/gui/app/templates/components/document/view-revision.hbs
@@ -6,7 +6,7 @@
 	{{#if hasDiff}}
 		<h1>{{revision.title}}</h1>
 		<h2>Changed by {{revision.firstname}} {{revision.lastname}}</h2>
-		<Ui::UiSpacer @size=200 />
+		<Ui::UiSpacer @size="200" />
 		<div class="diff-zone wysiwyg">
 			{{{diff}}}
 		</div>
@@ -14,7 +14,7 @@
 </div>
 
 {{#if canRollback}}
-	<Ui::UiSpacer @size=400 />
+	<Ui::UiSpacer @size="400" />
 	{{ui/ui-button color=constants.Color.Red icon=constants.Icon.TimeBack light=true label=constants.Label.Restore onClick=(action "onShowModal")}}
 {{/if}}
 
diff --git a/gui/app/templates/components/folder/documents-list.hbs b/gui/app/templates/components/folder/documents-list.hbs
index ef972826..b07a457f 100644
--- a/gui/app/templates/components/folder/documents-list.hbs
+++ b/gui/app/templates/components/folder/documents-list.hbs
@@ -20,7 +20,7 @@
 			{{#attach-popover class="ember-attacher-popper" hideOn="click" showOn="click" isShown=false placement="bottom-end" as |attacher|}}
 				<i class="dicon {{constants.Icon.Cross}} closer" {{action attacher.hide}}/>
 				<div class="container">
-					<Ui::UiSpacer @size=100 />
+					<Ui::UiSpacer @size="100" />
 
 					<div class="text-center">
 						<ul class="ui-option-picker ui-option-picker-horiz">
@@ -36,7 +36,7 @@
 						</ul>
 					</div>
 
-					<Ui::UiSpacer @size=100 />
+					<Ui::UiSpacer @size="100" />
 
 					<div class="text-center">
 						<ul class="ui-option-picker ui-option-picker-horiz">
@@ -49,7 +49,7 @@
 						</ul>
 					</div>
 
-					<Ui::UiSpacer @size=300 />
+					<Ui::UiSpacer @size="300" />
 
 					{{ui/ui-button
 						light=true
@@ -61,7 +61,7 @@
 		{{/ui/ui-button}}
 	</div>
 
-	<Ui::UiSpacer @size=200 />
+	<Ui::UiSpacer @size="200" />
 
 	<ul class="documents">
 		{{#each documents key="id" as |document|}}
diff --git a/gui/app/templates/components/folder/settings-category.hbs b/gui/app/templates/components/folder/settings-category.hbs
index cad96132..a5f1052f 100644
--- a/gui/app/templates/components/folder/settings-category.hbs
+++ b/gui/app/templates/components/folder/settings-category.hbs
@@ -16,7 +16,7 @@
 	</div>
 </div>
 
-<Ui::UiSpacer @size=400 />
+<Ui::UiSpacer @size="400" />
 
 <div class="space-admin">
 	<div class="categories">
diff --git a/gui/app/templates/components/folder/settings-permissions.hbs b/gui/app/templates/components/folder/settings-permissions.hbs
index 91f239f1..4c1802bc 100644
--- a/gui/app/templates/components/folder/settings-permissions.hbs
+++ b/gui/app/templates/components/folder/settings-permissions.hbs
@@ -22,7 +22,7 @@
 			<div class="perm-desc">Manage and delete space</div>
 		</div>
 
-		<Ui::UiSpacer @size=200 />
+		<Ui::UiSpacer @size="200" />
 
 		<div class="title" {{action "toggleDocumentPerms"}}>
 			Document Permissions Explained
@@ -55,7 +55,7 @@
 	</div>
 </div>
 
-<Ui::UiSpacer @size=300 />
+<Ui::UiSpacer @size="300" />
 
 <div class="text-center">
 	{{ui/ui-button color=constants.Color.Gray light=true icon=constants.Icon.Person
@@ -67,7 +67,7 @@
 		onClick=(action "onShowInviteModal")}}
 </div>
 
-<Ui::UiSpacer @size=300 />
+<Ui::UiSpacer @size="300" />
 
 <div class="space-admin table-responsive">
 	<table class="table table-hover permission-table">
@@ -98,7 +98,7 @@
 				<tr>
 					<td class="no-wrap no-width">
 						<i class="dicon {{constants.Icon.TriangleSmallDown}} cursor-pointer"/>
-						{{#attach-popover class="ember-attacher-popper" hideOn="clickout" showOn="click" isShown=false}}
+						{{#attach-popover class="ember-attacher-popper" hideOn="click clickout" showOn="click" isShown=false}}
 							<div class="menu">
 								<a class="item" href="#" {{action "onBulkPermission" permission true}}>Grant all</a>
 								<a class="item" href="#" {{action "onBulkPermission" permission false}}>Revoke all</a>
@@ -139,7 +139,7 @@
 	</table>
 </div>
 
-<Ui::UiSpacer @size=200 />
+<Ui::UiSpacer @size="200" />
 
 {{ui/ui-button color=constants.Color.Green light=true icon=constants.Icon.Locked
 	label=constants.Label.Save onClick=(action "onSave")}}
@@ -150,7 +150,7 @@
 			<div class="modal-header">Add users to this space</div>
 			<div class="modal-body">
 				{{input id="user-search" type="text" class="form-control mousetrap" placeholder="Search for users by firstname, lastname, email" value=searchText key-up=(action "onSearch")}}
-				<Ui::UiSpacer @size=200 />
+				<Ui::UiSpacer @size="200" />
 				<div class="space-admin">
 					<div class="add-users">
 						{{#each filteredUsers as |user|}}
diff --git a/gui/app/templates/components/folder/space-sidebar.hbs b/gui/app/templates/components/folder/space-sidebar.hbs
index 3a9313ae..8317afed 100644
--- a/gui/app/templates/components/folder/space-sidebar.hbs
+++ b/gui/app/templates/components/folder/space-sidebar.hbs
@@ -41,7 +41,7 @@
 		</div>
 	</div>
 
-	<Ui::UiSpacer @size=200 />
+	<Ui::UiSpacer @size="200" />
 
 	<div class="section">
 		<div class="title">category</div>
diff --git a/gui/app/templates/components/folder/space-toolbar.hbs b/gui/app/templates/components/folder/space-toolbar.hbs
index 8b2e6071..0b2ab6b0 100644
--- a/gui/app/templates/components/folder/space-toolbar.hbs
+++ b/gui/app/templates/components/folder/space-toolbar.hbs
@@ -1,7 +1,7 @@
 {{#ui/ui-toolbar dark=false light=false raised=false large=false bordered=false}}
 	{{#if (or hasDocuments pinState.isPinned session.authenticated)}}
 		{{#ui/ui-toolbar-dropdown label="Content" arrow=true}}
-			{{#attach-popover class="ember-attacher-popper" hideOn="clickout" showOn="click" isShown=false}}
+			{{#attach-popover class="ember-attacher-popper" hideOn="click clickout" showOn="click" isShown=false}}
 				<div class="menu">
 					{{#if pinState.isPinned}}
 						<li class="item" {{action "onUnpin"}}>Remove bookmark</li>
@@ -18,7 +18,7 @@
 
 	{{#if permissions.documentAdd}}
 		{{#ui/ui-toolbar-dropdown label="New" arrow=true}}
-			{{#attach-popover class="ember-attacher-popper" hideOn="clickout" showOn="click" isShown=false}}
+			{{#attach-popover class="ember-attacher-popper" hideOn="click clickout" showOn="click" isShown=false}}
 				<div class="menu">
 					<li class="item" {{action "onShowEmptyDocModal"}}>Blank canvas</li>
 					{{#if hasTemplates}}
diff --git a/gui/app/templates/components/layout/logo-heading.hbs b/gui/app/templates/components/layout/logo-heading.hbs
index bb2047c5..3be06dd7 100644
--- a/gui/app/templates/components/layout/logo-heading.hbs
+++ b/gui/app/templates/components/layout/logo-heading.hbs
@@ -18,4 +18,4 @@
 		{{layout/page-desc desc=desc}}
 	</div>
 </div>
-<Ui::UiSpacer @size=200 />
+<Ui::UiSpacer @size="200" />
diff --git a/gui/app/templates/components/onboard/share-folder.hbs b/gui/app/templates/components/onboard/share-folder.hbs
index e075aa49..cb3bc0d3 100644
--- a/gui/app/templates/components/onboard/share-folder.hbs
+++ b/gui/app/templates/components/onboard/share-folder.hbs
@@ -8,7 +8,7 @@
 			<label for="stage-1-lastname">Last name</label>
 			<input id="stage-1-lastname" type="text" value="" class="form-control form-control-lg">
 		</div>
-		<Ui::UiSpacer @size=300 />
+		<Ui::UiSpacer @size="300" />
 		{{ui/ui-button id="stage-1-next" color=constants.Color.Green light=true icon=constants.Icon.ArrowRight label=constants.Label.Next}}
 	</div>
 
@@ -24,7 +24,7 @@
 			<input id="stage-2-password-confirm" type="password" value="" class="form-control form-control-lg">
 			<small class="form-text text-muted">Re-type your chosen password</small>
 		</div>
-		<Ui::UiSpacer @size=300 />
+		<Ui::UiSpacer @size="300" />
 		{{ui/ui-button id="stage-2-next" color=constants.Color.Green light=true icon=constants.Icon.ArrowRight label=constants.Label.SignIn}}
 	</div>
 
diff --git a/gui/app/templates/components/search/search-results.hbs b/gui/app/templates/components/search/search-results.hbs
index 1053d358..dc010a96 100644
--- a/gui/app/templates/components/search/search-results.hbs
+++ b/gui/app/templates/components/search/search-results.hbs
@@ -12,7 +12,7 @@
 				{{#attach-popover class="ember-attacher-popper" hideOn="click" showOn="click" isShown=false placement="bottom-end" as |attacher|}}
 					<i class="dicon {{constants.Icon.Cross}} closer" {{action attacher.hide}}/>
 					<div class="container">
-						<Ui::UiSpacer @size=100 />
+						<Ui::UiSpacer @size="100" />
 
 						<div class="text-center">
 							<ul class="ui-option-picker ui-option-picker-horiz">
@@ -28,7 +28,7 @@
 							</ul>
 						</div>
 
-						<Ui::UiSpacer @size=100 />
+						<Ui::UiSpacer @size="100" />
 
 						<div class="text-center">
 							<ul class="ui-option-picker ui-option-picker-horiz">
@@ -41,7 +41,7 @@
 							</ul>
 						</div>
 
-						<Ui::UiSpacer @size=300 />
+						<Ui::UiSpacer @size="300" />
 
 						{{ui/ui-button
 							light=true
@@ -53,7 +53,7 @@
 			{{/ui/ui-button}}
 		</div>
 
-		<Ui::UiSpacer @size=200 />
+		<Ui::UiSpacer @size="200" />
 	{{/if}}
 
 	<div class="result-summary">{{resultPhrase}}</div>
diff --git a/gui/app/templates/components/search/search-view.hbs b/gui/app/templates/components/search/search-view.hbs
index ae565c43..744f1f76 100644
--- a/gui/app/templates/components/search/search-view.hbs
+++ b/gui/app/templates/components/search/search-view.hbs
@@ -10,7 +10,7 @@
 	{{#if validSearch}}
 		{{search/search-results results=results keywords=keywords}}
 	{{else}}
-		<Ui::UiSpacer @size=300 />
+		<Ui::UiSpacer @size="300" />
 		<p class="color-red-700">Your search query is too short</p>
 	{{/if}}
 </div>
diff --git a/gui/app/templates/components/section/jira/type-editor.hbs b/gui/app/templates/components/section/jira/type-editor.hbs
index 8eb85d38..bab6e886 100644
--- a/gui/app/templates/components/section/jira/type-editor.hbs
+++ b/gui/app/templates/components/section/jira/type-editor.hbs
@@ -8,7 +8,7 @@
 		{{#link-to "customize.integrations"}}
 			{{ui/ui-button color=constants.Color.Green light=true label="Configure Jira Connector"}}
 		{{/link-to}}
-		<Ui::UiSpacer @size=300 />
+		<Ui::UiSpacer @size="300" />
 	{{else}}
 		{{#unless authenticated}}
 			<p class="color-green-600">Your Documize administrator needs to provide Jira connection details before usage.</p>
@@ -23,10 +23,10 @@
 			{{ui/ui-button color=constants.Color.Yellow light=true label=constants.Label.Preview submit=true onClick=(action "onPreview")}}
 		</form>
 
-		<Ui::UiSpacer @size=300 />>
+		<Ui::UiSpacer @size="300" />>
 		{{{issuesGrid}}}
 	{{else}}
-		<Ui::UiSpacer @size=300 />
+		<Ui::UiSpacer @size="300" />
 		<p class="color-gray-700">Jira connector not authenticated</p>
 	{{/if}}
 {{/section/base-editor}}
diff --git a/gui/app/templates/components/section/plantuml/type-editor.hbs b/gui/app/templates/components/section/plantuml/type-editor.hbs
index 167eed6b..89e669f6 100644
--- a/gui/app/templates/components/section/plantuml/type-editor.hbs
+++ b/gui/app/templates/components/section/plantuml/type-editor.hbs
@@ -9,7 +9,7 @@
 	<div class="section-plantuml-diagram">
 		<div class="form-group">
 			<label><a href="http://plantuml.com/" target="_blank">PlantUML Diagram</a></label>
-			<Ui::UiSpacer @size=200 />
+			<Ui::UiSpacer @size="200" />
 			<div>
 				<p>Insert sample diagrams:</p>
 				<p>
@@ -26,16 +26,16 @@
 		</div>
 	</div>
 
-	<Ui::UiSpacer @size=200 />
+	<Ui::UiSpacer @size="200" />
 
 	{{ui/ui-button color=constants.Color.Yellow light=true label=previewButtonCaption onClick=(action "onPreview")}}
 
-	<Ui::UiSpacer @size=200 />
+	<Ui::UiSpacer @size="200" />
 
 	<div id={{previewId}} class="text-center">
 		<img src={{diagramPreview}}>
 	</div>
 
-	<Ui::UiSpacer @size=200 />
+	<Ui::UiSpacer @size="200" />
 
 {{/section/base-editor}}
diff --git a/gui/app/templates/components/section/tabular/type-editor.hbs b/gui/app/templates/components/section/tabular/type-editor.hbs
index 913bc6da..52a09cea 100644
--- a/gui/app/templates/components/section/tabular/type-editor.hbs
+++ b/gui/app/templates/components/section/tabular/type-editor.hbs
@@ -17,7 +17,7 @@
 			onClick=(action "onShowImportModal")}}
 	</div>
 
-	<Ui::UiSpacer @size=300 />
+	<Ui::UiSpacer @size="300" />
 
 	<div id={{editorId}} class="mousetrap wysiwyg wysiwyg-editor">
 		{{{pageBody}}}
diff --git a/gui/app/templates/components/setup/documize-setup.hbs b/gui/app/templates/components/setup/documize-setup.hbs
index d5cb932a..999b38c0 100644
--- a/gui/app/templates/components/setup/documize-setup.hbs
+++ b/gui/app/templates/components/setup/documize-setup.hbs
@@ -1,12 +1,12 @@
 <div class="installer">
 	<img src="/assets/img/setup/logo-purple.png" srcset="/assets/img/setup/logo-purple@2x.png" alt="Documize Setup" style="width: 250px; height: 76px;">
-	<Ui::UiSpacer @size=300 />
+	<Ui::UiSpacer @size="300" />
 	<h1 class="color-theme-700">Installation Guide</h1>
 	<p class="color-gray-800">
 		Review the <a href="https://docs.documize.com/s/VzO9ZqMOCgABGyfW/installation-guides/d/V16L08ucxwABhZF6/installation-guide">installation instructions</a>
 		and recommended <a href="https://docs.documize.com/s/VzO9ZqMOCgABGyfW/installation-guides/d/V2KuM8ICcQABagM5/mysql-specific-database-tuning">database tuning guide</a>
 	</p>
-	<Ui::UiSpacer @size=300 />
+	<Ui::UiSpacer @size="300" />
 
 	<form {{action "save" on="submit"}}>
 		<div class="form-group">
@@ -35,5 +35,5 @@
 		{{ui/ui-button submit=true color=constants.Color.Green light=true label=buttonLabel onClick=(action "save")}}
 	</form>
 
-	<Ui::UiSpacer @size=300 />
+	<Ui::UiSpacer @size="300" />
 </div>
diff --git a/gui/app/templates/components/spaces/space-list.hbs b/gui/app/templates/components/spaces/space-list.hbs
index 0d6bdda2..cbbf5e0f 100644
--- a/gui/app/templates/components/spaces/space-list.hbs
+++ b/gui/app/templates/components/spaces/space-list.hbs
@@ -11,7 +11,7 @@
 		{{/ui/ui-toolbar}}
 	</div>
 
-	<Ui::UiSpacer @size=200 />
+	<Ui::UiSpacer @size="200" />
 
 	<ul class="list">
 		{{#each spaces as |space|}}
diff --git a/gui/app/templates/components/user/forgot-password.hbs b/gui/app/templates/components/user/forgot-password.hbs
index 189c0c9b..652fc2bf 100644
--- a/gui/app/templates/components/user/forgot-password.hbs
+++ b/gui/app/templates/components/user/forgot-password.hbs
@@ -12,6 +12,6 @@
 		{{ui/ui-button color=constants.Color.Yellow light=true label=constants.Label.Reset onClick=(action "forgot")}}
     {{/if}}
 
-	<Ui::UiSpacer @size=400 />
+	<Ui::UiSpacer @size="400" />
 	{{#link-to "auth.login"}}Click here to sign in{{/link-to}}
 </form>