diff --git a/frontend/src/app/api.service.ts b/frontend/src/app/api.service.ts
index 9821f22..c4396fe 100644
--- a/frontend/src/app/api.service.ts
+++ b/frontend/src/app/api.service.ts
@@ -27,7 +27,7 @@ export class ApiService {
   }
 
   requestItemCount(url: string): Promise<number> {
-    return this.request('get', url + '/count', {});
+    return this.request('get', url + '/count', {}).then(count => count.count);
   }
 
   async logout(): Promise<void> {
diff --git a/frontend/src/app/shared-components/edit/edit.component.html b/frontend/src/app/shared-components/edit/edit.component.html
index 66f53ba..848e061 100644
--- a/frontend/src/app/shared-components/edit/edit.component.html
+++ b/frontend/src/app/shared-components/edit/edit.component.html
@@ -1,9 +1,14 @@
 <div *ngIf="!isLoading; else loading">
   <form [formGroup]="formGroup">
-    <mat-form-field *ngFor="let field of fields">
+    <div *ngFor="let field of fields">
       <mat-label>{{ field.title }}</mat-label>
-      <input matInput [formControlName]="field.name" type="text"/>
-    </mat-form-field>
+      <span [ngSwitch]="getType(item[field.name])">
+        <span *ngSwitchCase="'boolean'"><mat-checkbox [checked]="item[field.name]" [formControlName]="field.name"></mat-checkbox></span>
+        <mat-form-field *ngSwitchDefault>
+          <input matInput [formControlName]="field.name" type="text" [value]="item[field.name]"/>
+        </mat-form-field>
+      </span>
+    </div>
     <button mat-raised-button color="primary" (click)="submit()">Mentés</button>
   </form>
 </div>
diff --git a/frontend/src/app/shared-components/edit/edit.component.ts b/frontend/src/app/shared-components/edit/edit.component.ts
index 2f99dad..3997639 100644
--- a/frontend/src/app/shared-components/edit/edit.component.ts
+++ b/frontend/src/app/shared-components/edit/edit.component.ts
@@ -36,15 +36,22 @@ export class EditComponent<T extends Model> implements OnInit {
   }
 
   async submit(): Promise<void> {
+    this.isLoading = true;
     try {
       if (this.item) {
         await this.api.request('patch', this.apiPath + '/' + this.item.id, this.formGroup.value);
       } else {
         await this.api.request('post', this.apiPath, this.formGroup.value);
       }
+      await this.router.navigateByUrl(this.router.url.substring(0, this.router.url.lastIndexOf('/')));
     } catch (e) {
       alert(e);
     }
+    this.isLoading = false;
+  }
+
+  getType(itemElement: any): typeof itemElement {
+    return typeof itemElement;
   }
 
 }