diff --git a/src/main/resources/templates/admin/admin_option.ftl b/src/main/resources/templates/admin/admin_option.ftl
index e677f53cb..8ff420490 100755
--- a/src/main/resources/templates/admin/admin_option.ftl
+++ b/src/main/resources/templates/admin/admin_option.ftl
@@ -83,7 +83,7 @@
- ')"><@spring.message code='common.btn.choose' />
+ ')"><@spring.message code='common.btn.choose' />
@@ -94,7 +94,7 @@
- ')"><@spring.message code='common.btn.choose' />
+ ')"><@spring.message code='common.btn.choose' />
@@ -145,7 +145,7 @@
-
+
@@ -207,7 +207,7 @@
-
+
@@ -504,6 +504,17 @@
+
diff --git a/src/main/resources/templates/admin/admin_profile.ftl b/src/main/resources/templates/admin/admin_profile.ftl
index 4474ef514..2c076f20f 100644
--- a/src/main/resources/templates/admin/admin_profile.ftl
+++ b/src/main/resources/templates/admin/admin_profile.ftl
@@ -67,7 +67,7 @@
- ')"><@spring.message code='common.btn.choose' />
+ ')"><@spring.message code='common.btn.choose' />
diff --git a/src/main/resources/templates/admin/module/_macro.ftl b/src/main/resources/templates/admin/module/_macro.ftl
index c069e5489..738500352 100644
--- a/src/main/resources/templates/admin/module/_macro.ftl
+++ b/src/main/resources/templates/admin/module/_macro.ftl
@@ -22,6 +22,13 @@
+ <#if options.admin_layout_boxed_background??>
+
+ #if>