diff --git a/frontend/app/features/content/shared/due-time-selector.component.html b/frontend/app/features/content/shared/due-time-selector.component.html
index 707a55fcc..c23ab328c 100644
--- a/frontend/app/features/content/shared/due-time-selector.component.html
+++ b/frontend/app/features/content/shared/due-time-selector.component.html
@@ -23,7 +23,7 @@
         </ng-container>
     
         <ng-container footer>
-            <button type="button" class="btn btn-text-secondary" (click)="cancelStatusChange()">
+            <button type="button" class="btn btn-text-secondary2" (click)="cancelStatusChange()">
                 {{ 'common.cancel' | sqxTranslate }}
             </button>
     
diff --git a/frontend/app/features/content/shared/list/content-value-editor.component.html b/frontend/app/features/content/shared/list/content-value-editor.component.html
index 7492b1971..4120d52ea 100644
--- a/frontend/app/features/content/shared/list/content-value-editor.component.html
+++ b/frontend/app/features/content/shared/list/content-value-editor.component.html
@@ -38,9 +38,9 @@
                     <sqx-toggle [formControlName]="field.name" [threeStates]="!field.properties.isRequired"></sqx-toggle>
                 </ng-container>
                 <ng-container *ngSwitchCase="'Checkbox'">
-                    <div class="custom-control custom-checkbox custom-control custom-checkbox-inline">
-                        <input class="custom-control-input" type="checkbox" [formControlName]="field.name" sqxIndeterminateValue>
-                        <label class="custom-control-label"></label>
+                    <div class="custom-control custom-checkbox">
+                        <input class="custom-control-input" type="checkbox" [formControlName]="field.name" id="{{uniqueId}}" sqxIndeterminateValue>
+                        <label class="custom-control-label" for="{{uniqueId}}"></label>
                     </div>
                 </ng-container>
             </ng-container>
diff --git a/frontend/app/features/content/shared/list/content-value-editor.component.ts b/frontend/app/features/content/shared/list/content-value-editor.component.ts
index 725ec897b..566df9c9f 100644
--- a/frontend/app/features/content/shared/list/content-value-editor.component.ts
+++ b/frontend/app/features/content/shared/list/content-value-editor.component.ts
@@ -7,7 +7,7 @@
 
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
 import { FormGroup } from '@angular/forms';
-import { FieldDto } from '@app/shared';
+import { FieldDto, MathHelper } from '@app/shared';
 
 @Component({
     selector: 'sqx-content-value-editor',
@@ -21,4 +21,6 @@ export class ContentValueEditorComponent {
 
     @Input()
     public form: FormGroup;
+
+    public uniqueId = MathHelper.guid();
 }
\ No newline at end of file
diff --git a/frontend/app/features/content/shared/references/content-selector.component.html b/frontend/app/features/content/shared/references/content-selector.component.html
index e281ceea2..594fe0851 100644
--- a/frontend/app/features/content/shared/references/content-selector.component.html
+++ b/frontend/app/features/content/shared/references/content-selector.component.html
@@ -85,7 +85,7 @@
     </ng-container>
 
     <ng-container footer>
-        <button type="button" class="btn text-secondary" (click)="emitComplete()">
+        <button type="button" class="btn text-secondary2" (click)="emitComplete()">
             {{ 'common.cancel' | sqxTranslate }}
         </button>