diff --git a/modules/boonex/artificer/data/template/system/css/forms.css b/modules/boonex/artificer/data/template/system/css/forms.css
index 04c17dd125..bba8182ae5 100644
--- a/modules/boonex/artificer/data/template/system/css/forms.css
+++ b/modules/boonex/artificer/data/template/system/css/forms.css
@@ -19,14 +19,10 @@ import url(../../../../../../../template/css/forms.css);
     padding-top:0; 
 }
 
-.bx-form-advanced-wrapper .bx-form-section-wrapper:last-child .bx-form-section-content {
+.bx-form-advanced-wrapper .bx-form-section-divider:last-child .bx-form-section-content {
     padding-bottom:0;
 }
 
-.bx-form-advanced-wrapper .bx-form-section-wrapper:first-child .bx-form-row-view-wrapper:first-child {
-    padding-top:0;
-}
-
 .bx-form-input-wrapper-pgc {
     position: relative;
 }
diff --git a/modules/boonex/classes/template/classes_in_context.html b/modules/boonex/classes/template/classes_in_context.html
index f39a102383..473cfbddf8 100644
--- a/modules/boonex/classes/template/classes_in_context.html
+++ b/modules/boonex/classes/template/classes_in_context.html
@@ -43,5 +43,5 @@
 </script>
 </bx_if:edit_modules>
 <template id="bx-classes-tmpl-btn">
-    <a href="#" class="bx-btn bx-btn-small bx-classes-module-action bx-def-margin-sec-left" data-action="{action}" data-val="{data}"><i class="sys-icon {icon}"></i></a>
+    <a href="#" class="bx-btn bx-btn-small bx-classes-module-action bx-def-margin-sec-right" data-action="{action}" data-val="{data}"><i class="sys-icon {icon}"></i></a>
 </template>
diff --git a/modules/boonex/classes/template/css/main.css b/modules/boonex/classes/template/css/main.css
index da754d79f1..19873f0127 100644
--- a/modules/boonex/classes/template/css/main.css
+++ b/modules/boonex/classes/template/css/main.css
@@ -10,6 +10,14 @@
     min-height:1rem;
 }
 
+.bx-course-classes .bx-form-section-title .bx-form-section-toggler {
+    display: none;
+}
+
+.bx-course-classes .bx-form-section-title .bx-classes-module-action:last-child {
+    margin-right: 1.5rem;
+}
+
 .bx-course-classes .bx-classes-placeholder:not(:first-child),
 .bx-course-classes .bx-classes-class:not(:first-child) {
     margin-top:1rem;
diff --git a/template/css/forms.css b/template/css/forms.css
index b5eea23eeb..ab33579c6a 100644
--- a/template/css/forms.css
+++ b/template/css/forms.css
@@ -16,14 +16,10 @@
     padding-top:0; 
 }
 
-.bx-form-advanced-wrapper .bx-form-section-wrapper:last-child .bx-form-section-content {
+.bx-form-advanced-wrapper .bx-form-section-divider:last-child .bx-form-section-content {
     padding-bottom:0;
 }
 
-.bx-form-advanced-wrapper .bx-form-section-wrapper:first-child .bx-form-row-view-wrapper:first-child {
-    padding-top:0;
-}
-
 .bx-form-section-wrapper {
     position:relative;
 }