diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 0ac131d..9b5993e 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -43,7 +43,7 @@ export class AppComponent implements OnInit {
   public virtualRootPageId?: string;
   public options = {
     isExpandedField: 'expanded',
-    animateExpand: true,
+    animateExpand: false,
     scrollOnActivate: false,
     allowDrag: true,
     allowDrop: (element, { parent, index }) => {
diff --git a/src/app/components/editor/database/database.component.ts b/src/app/components/editor/database/database.component.ts
index e7e0faf..d3a20d5 100644
--- a/src/app/components/editor/database/database.component.ts
+++ b/src/app/components/editor/database/database.component.ts
@@ -236,6 +236,7 @@ export class DatabaseComponent extends EditorNodeContract implements OnInit {
       x.editable = !this.readonly;
       x.minWidth = 150;
       x.resizable = true;
+      x._parentEditorUUID = this.editorUUID;
 
       if ( x.additionalData?.width ) {
         x.width = x.additionalData.width;
diff --git a/src/app/components/editor/database/renderers/boolean-renderer.component.ts b/src/app/components/editor/database/renderers/boolean-renderer.component.ts
index dd5bd75..32fe248 100644
--- a/src/app/components/editor/database/renderers/boolean-renderer.component.ts
+++ b/src/app/components/editor/database/renderers/boolean-renderer.component.ts
@@ -1,13 +1,14 @@
 import {ICellRendererAngularComp} from 'ag-grid-angular';
 import {Component} from '@angular/core';
 import {ICellRendererParams} from 'ag-grid-community';
+import {EditorService} from '../../../../service/editor.service';
 
 @Component({
     selector: 'editor-boolean-renderer',
     template: `
         <ng-container *ngIf="!checkbox">{{ display }}</ng-container>
         <div *ngIf="checkbox" style="width: 100%; text-align: center; padding-top: 3px;">
-            <ion-checkbox [checked]="params.value" (ionChange)="onChecked($event)"></ion-checkbox>
+            <ion-checkbox [checked]="params.value" (ionChange)="onChecked($event)" [disabled]="!editorService.canEdit()"></ion-checkbox>
         </div>
     `,
     styles: [`
@@ -27,9 +28,20 @@ export class BooleanRendererComponent implements ICellRendererAngularComp {
 
     public checked = false;
 
+    constructor(
+        public editorService: EditorService,
+    ) { }
+
     agInit(params: ICellRendererParams): void {
+        console.log('bool renderer', this);
         this.params = params;
 
+        // @ts-ignore
+        if ( this.params.colDef._parentEditorUUID ) {
+            // @ts-ignore
+            this.editorService = this.editorService.getEditor(this.params.colDef._parentEditorUUID)
+        }
+
         // @ts-ignore
         this.checkbox = params.colDef.additionalData.labelType === 'checkbox';
 
diff --git a/src/app/components/editor/files/files.component.ts b/src/app/components/editor/files/files.component.ts
index 6ce6ce3..e8bd448 100644
--- a/src/app/components/editor/files/files.component.ts
+++ b/src/app/components/editor/files/files.component.ts
@@ -72,7 +72,9 @@ export class FilesComponent extends EditorNodeContract implements OnInit {
     }
 
     this.pendingSetup = false;
-    this.fileUploader.nativeElement.value = null;
+    if ( this.fileUploader ) {
+      this.fileUploader.nativeElement.value = null;
+    }
   }
 
   public async performDelete(): Promise<void> {