diff --git a/src/Squidex/app/features/content/pages/content/content-field.component.html b/src/Squidex/app/features/content/pages/content/content-field.component.html
index 12eafe95b..7d69f79db 100644
--- a/src/Squidex/app/features/content/pages/content/content-field.component.html
+++ b/src/Squidex/app/features/content/pages/content/content-field.component.html
@@ -79,7 +79,7 @@
                             <ng-container class="form-check form-check-inline" *ngFor="let value of field.properties['allowedValues']">
                                 <input class="form-check-input" type="radio" value="{{value}}" [formControl]="selectedFormControl" />
                                 <label class="form-check-label">
-                                        {{value}}
+                                    {{value}}
                                 </label>
                             </ng-container>
                         </ng-container>
@@ -91,9 +91,7 @@
                             <sqx-toggle [formControl]="selectedFormControl"></sqx-toggle>
                         </ng-container>
                         <ng-container *ngSwitchCase="'Checkbox'">
-                            <ng-container class="form-check form-check-inline">
-                                <input class="form-check-input" type="checkbox" [formControl]="selectedFormControl" sqxIndeterminateValue />
-                            </ng-container>
+                            <input type="checkbox" [formControl]="selectedFormControl" sqxIndeterminateValue />
                         </ng-container>
                     </ng-container>
                 </ng-container>
diff --git a/src/Squidex/app/features/schemas/pages/schema/schema-page.component.html b/src/Squidex/app/features/schemas/pages/schema/schema-page.component.html
index 91802f822..d791146b5 100644
--- a/src/Squidex/app/features/schemas/pages/schema/schema-page.component.html
+++ b/src/Squidex/app/features/schemas/pages/schema/schema-page.component.html
@@ -60,8 +60,10 @@
         </div>
 
         <div dnd-sortable-container [sortableData]="schema.fields">
-            <div *ngFor="let field of schema.fields; let i = index;" dnd-sortable [sortableIndex]="i" (sqxSorted)="sortFields($event)">
-                <sqx-field [field]="field" [schema]="schema" [patterns]="patternsState.patterns | async"></sqx-field>
+            <div class="schemas">
+                <div *ngFor="let field of schema.fields; let i = index;" dnd-sortable [sortableIndex]="i" (sqxSorted)="sortFields($event)">
+                    <sqx-field [field]="field" [schema]="schema" [patterns]="patternsState.patterns | async"></sqx-field>
+                </div>
             </div>
     
             <button class="btn btn-success field-button" (click)="addFieldDialog.show()">
diff --git a/src/Squidex/app/features/schemas/pages/schema/schema-page.component.scss b/src/Squidex/app/features/schemas/pages/schema/schema-page.component.scss
index 9cf354ba1..e4adeb7bb 100644
--- a/src/Squidex/app/features/schemas/pages/schema/schema-page.component.scss
+++ b/src/Squidex/app/features/schemas/pages/schema/schema-page.component.scss
@@ -24,6 +24,10 @@
     margin-right: 1rem;
 }
 
+.schemas {
+    padding-bottom: 7rem;
+}
+
 .schema {
     &-edit {
         color: $color-border-dark;
@@ -44,7 +48,7 @@
     & {
         @include circle(5.25rem);
         @include box-shadow(0, 8px, 16px, .3);
-        @include absolute(auto, 5rem, 1rem, auto);
+        @include absolute(auto, 6rem, 1rem, auto);
     }
 
     &-icon {
@@ -56,10 +60,6 @@
     }
 }
 
-.panel-content-scroll {
-    padding-bottom: 7rem;
-}
-
 .dnd-sortable-drag {
     border: 0;
 }
\ No newline at end of file