diff --git a/src/app/admin/team-editor/team-editor.component.html b/src/app/admin/team-editor/team-editor.component.html
index e2b057b..0a30e27 100644
--- a/src/app/admin/team-editor/team-editor.component.html
+++ b/src/app/admin/team-editor/team-editor.component.html
@@ -1,10 +1,77 @@
 <div class="ui main container">
     <h1 class="ui dividing header">Team editor</h1>
     <form class="ui form" #teamEditorForm (ngSubmit)="saveTeam()">
-        <div class="six wide field">
-            <label for="team_name">Team name</label>
-            <input id="team_name" type="text" name="team_name" [(ngModel)]="team.name">
+        <div class="two fields">
+            <div class="six wide field">
+                <label for="team_name">Team name</label>
+                <input id="team_name" type="text" name="team_name" [(ngModel)]="team.name">
+            </div>
+            <div class="six wide field">
+                <label for="filter_id">Jira filter id</label>
+                <input id="filter_id" type="number" name="filter_id" [(ngModel)]="team.filterId">
+            </div>
         </div>
+        <h5 class="ui header">1st column</h5>
+        <div class="four fields">
+            <div class="six wide field">
+                <input type="text" name="column1_js"
+                       placeholder="Jira column name" [(ngModel)]="team.backlogColumn.jiraStatusName">
+            </div>
+            <div class="four wide field">
+                <input type="text" name="column1_l"
+                       placeholder="Kanban board header" [(ngModel)]="team.backlogColumn.label">
+            </div>
+            <div class="two wide field">
+                <input type="text" name="column1_wip"
+                       placeholder="WIP limit" [(ngModel)]="team.backlogColumn.wipLimit">
+            </div>
+        </div>
+        <h5 class="ui header">2nd column</h5>
+        <div class="four fields">
+            <div class="six wide field">
+                <input type="text" name="column2_js"
+                       placeholder="Jira column name" [(ngModel)]="team.inprogressColumn.jiraStatusName">
+            </div>
+            <div class="four wide field">
+                <input type="text" name="column2_l"
+                       placeholder="Kanban board header" [(ngModel)]="team.inprogressColumn.label">
+            </div>
+            <div class="two wide field">
+                <input type="text" name="column2_wip"
+                       placeholder="WIP limit" [(ngModel)]="team.inprogressColumn.wipLimit">
+            </div>
+        </div>
+        <h5 class="ui header">3rd column</h5>
+        <div class="four fields">
+            <div class="six wide field">
+                <input type="text" name="column3_js"
+                       placeholder="Jira column name" [(ngModel)]="team.verificationColumn.jiraStatusName">
+            </div>
+            <div class="four wide field">
+                <input type="text" name="column3_l"
+                       placeholder="Kanban board header" [(ngModel)]="team.verificationColumn.label">
+            </div>
+            <div class="two wide field">
+                <input type="text" name="column3_wip"
+                       placeholder="WIP limit" [(ngModel)]="team.verificationColumn.wipLimit">
+            </div>
+        </div>
+        <h5 class="ui header">4th column</h5>
+        <div class="four fields">
+            <div class="six wide field">
+                <input type="text" name="column4_js"
+                       placeholder="Jira column name" [(ngModel)]="team.doneColumn.jiraStatusName">
+            </div>
+            <div class="four wide field">
+                <input type="text" name="column4_l"
+                       placeholder="Kanban board header" [(ngModel)]="team.doneColumn.label">
+            </div>
+            <div class="two wide field">
+                <input type="text" name="column4_wip"
+                       placeholder="WIP limit" [(ngModel)]="team.doneColumn.wipLimit">
+            </div>
+        </div>
+
         <div class="six wide field">
             <label for="team_name"> </label>
             <div class="ui checkbox">
diff --git a/src/app/shared/kanban-column.ts b/src/app/shared/kanban-column.ts
new file mode 100644
index 0000000..2ff9d1d
--- /dev/null
+++ b/src/app/shared/kanban-column.ts
@@ -0,0 +1,5 @@
+export class KanbanColumn {
+  jiraStatusName = '';
+  label = '';
+  wipLimit = 0;
+}
diff --git a/src/app/shared/team.ts b/src/app/shared/team.ts
index 8664a5d..72dc8a6 100644
--- a/src/app/shared/team.ts
+++ b/src/app/shared/team.ts
@@ -1,9 +1,15 @@
 import { Member } from './member';
+import { KanbanColumn } from './kanban-column';
 
 export class Team {
   id: number = null;
   name: String = '';
   members: Array<Member> = [];
+  filterId: number;
+  backlogColumn: KanbanColumn = new KanbanColumn();
+  inprogressColumn: KanbanColumn = new KanbanColumn();
+  verificationColumn: KanbanColumn = new KanbanColumn();
+  doneColumn: KanbanColumn = new KanbanColumn();
   isActive = false;
   createdAt: String = null;
   updatedAt: String = null;