diff --git a/pkg/db/fixtures/buckets.yml b/pkg/db/fixtures/buckets.yml
index 4d565ae91..d5b23f4c0 100644
--- a/pkg/db/fixtures/buckets.yml
+++ b/pkg/db/fixtures/buckets.yml
@@ -1,6 +1,6 @@
 - id: 1
   title: testbucket1
-  project_id: 1
+  project_view_id: 4
   created_by_id: 1
   limit: 9999999 # This bucket has a limit we will never exceed in the tests to make sure the logic allows for buckets with limits
   position: 1
@@ -8,7 +8,7 @@
   updated: 2020-04-18 21:13:52
 - id: 2
   title: testbucket2
-  project_id: 1
+  project_view_id: 4
   created_by_id: 1
   limit: 3
   position: 2
@@ -16,14 +16,14 @@
   updated: 2020-04-18 21:13:52
 - id: 3
   title: testbucket3
-  project_id: 1
+  project_view_id: 4
   created_by_id: 1
   position: 3
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 4
   title: testbucket4 - other project
-  project_id: 2
+  project_view_id: 8
   created_by_id: 1
   position: 1
   created: 2020-04-18 21:13:52
@@ -31,221 +31,221 @@
 # The following are not or only partly owned by user 1
 - id: 5
   title: testbucket5
-  project_id: 20
+  project_view_id: 80
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 6
   title: testbucket6
-  project_id: 6
+  project_view_id: 24
   created_by_id: 1
   position: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 7
   title: testbucket7
-  project_id: 7
+  project_view_id: 28
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 8
   title: testbucket8
-  project_id: 8
+  project_view_id: 32
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 9
   title: testbucket9
-  project_id: 9
+  project_view_id: 36
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 10
   title: testbucket10
-  project_id: 10
+  project_view_id: 40
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 11
   title: testbucket11
-  project_id: 11
+  project_view_id: 44
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 12
   title: testbucket13
-  project_id: 12
+  project_view_id: 48
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 13
   title: testbucket13
-  project_id: 13
+  project_view_id: 52
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 14
   title: testbucket14
-  project_id: 14
+  project_view_id: 56
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 15
   title: testbucket15
-  project_id: 15
+  project_view_id: 60
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 16
   title: testbucket16
-  project_id: 16
+  project_view_id: 64
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 17
   title: testbucket17
-  project_id: 17
+  project_view_id: 68
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 18
   title: testbucket18
-  project_id: 5
+  project_view_id: 20
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 19
   title: testbucket19
-  project_id: 21
+  project_view_id: 84
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 20
   title: testbucket20
-  project_id: 22
+  project_view_id: 88
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 21
   title: testbucket21
-  project_id: 3
+  project_view_id: 12
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 # Duplicate buckets to make deletion of one of them possible
 - id: 22
   title: testbucket22
-  project_id: 6
+  project_view_id: 24
   created_by_id: 1
   position: 2
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 23
   title: testbucket23
-  project_id: 7
+  project_view_id: 28
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 24
   title: testbucket24
-  project_id: 8
+  project_view_id: 32
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 25
   title: testbucket25
-  project_id: 9
+  project_view_id: 36
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 26
   title: testbucket26
-  project_id: 10
+  project_view_id: 40
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 27
   title: testbucket27
-  project_id: 11
+  project_view_id: 44
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 28
   title: testbucket28
-  project_id: 12
+  project_view_id: 48
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 29
   title: testbucket29
-  project_id: 13
+  project_view_id: 52
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 30
   title: testbucket30
-  project_id: 14
+  project_view_id: 56
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 31
   title: testbucket31
-  project_id: 15
+  project_view_id: 60
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 32
   title: testbucket32
-  project_id: 16
+  project_view_id: 64
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 33
   title: testbucket33
-  project_id: 17
+  project_view_id: 68
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 # This bucket is the last one in its project
 - id: 34
   title: testbucket34
-  project_id: 18
+  project_view_id: 72
   created_by_id: 1
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 35
   title: testbucket35
-  project_id: 23
+  project_view_id: 92
   created_by_id: -2
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 36
   title: testbucket36
-  project_id: 33
+  project_view_id: 132
   created_by_id: 6
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 37
   title: testbucket37
-  project_id: 34
+  project_view_id: 136
   created_by_id: 6
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 38
   title: testbucket36
-  project_id: 36
+  project_view_id: 144
   created_by_id: 15
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 39
   title: testbucket38
-  project_id: 38
+  project_view_id: 152
   created_by_id: 15
   created: 2020-04-18 21:13:52
   updated: 2020-04-18 21:13:52
 - id: 40
   title: testbucket40
-  project_id: 2
+  project_view_id: 8
   created_by_id: 1
   position: 10
   created: 2020-04-18 21:13:52
diff --git a/pkg/db/fixtures/project_views.yml b/pkg/db/fixtures/project_views.yml
new file mode 100644
index 000000000..09df1ae04
--- /dev/null
+++ b/pkg/db/fixtures/project_views.yml
@@ -0,0 +1,954 @@
+- id: 1
+  title: List
+  project_id: 1
+  view_kind: 0
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 2
+  title: Gantt
+  project_id: 1
+  view_kind: 1
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 3
+  title: Table
+  project_id: 1
+  view_kind: 2
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 4
+  title: Kanban
+  project_id: 1
+  view_kind: 3
+  done_bucket_id: 3
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+  bucket_configuration_mode: 1
+- id: 5
+  title: List
+  project_id: 2
+  view_kind: 0
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 6
+  title: Gantt
+  project_id: 2
+  view_kind: 1
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 7
+  title: Table
+  project_id: 2
+  view_kind: 2
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 8
+  title: Kanban
+  project_id: 2
+  view_kind: 3
+  done_bucket_id: 4
+  default_bucket_id: 40
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+  bucket_configuration_mode: 1
+- id: 9
+  title: List
+  project_id: 3
+  view_kind: 0
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 10
+  title: Gantt
+  project_id: 3
+  view_kind: 1
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 11
+  title: Table
+  project_id: 3
+  view_kind: 2
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 12
+  title: Kanban
+  project_id: 3
+  view_kind: 3
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+  bucket_configuration_mode: 1
+- id: 13
+  title: List
+  project_id: 4
+  view_kind: 0
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 14
+  title: Gantt
+  project_id: 4
+  view_kind: 1
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 15
+  title: Table
+  project_id: 4
+  view_kind: 2
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 16
+  title: Kanban
+  project_id: 4
+  view_kind: 3
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+  bucket_configuration_mode: 1
+- id: 17
+  title: List
+  project_id: 5
+  view_kind: 0
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 18
+  title: Gantt
+  project_id: 5
+  view_kind: 1
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 19
+  title: Table
+  project_id: 5
+  view_kind: 2
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 20
+  title: Kanban
+  project_id: 5
+  view_kind: 3
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+  bucket_configuration_mode: 1
+- id: 21
+  title: List
+  project_id: 6
+  view_kind: 0
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 22
+  title: Gantt
+  project_id: 6
+  view_kind: 1
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 23
+  title: Table
+  project_id: 6
+  view_kind: 2
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 24
+  title: Kanban
+  project_id: 6
+  view_kind: 3
+  default_bucket_id: 22
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+  bucket_configuration_mode: 1
+- id: 25
+  title: List
+  project_id: 7
+  view_kind: 0
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 26
+  title: Gantt
+  project_id: 7
+  view_kind: 1
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 27
+  title: Table
+  project_id: 7
+  view_kind: 2
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 28
+  title: Kanban
+  project_id: 7
+  view_kind: 3
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+  bucket_configuration_mode: 1
+- id: 29
+  title: List
+  project_id: 8
+  view_kind: 0
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 30
+  title: Gantt
+  project_id: 8
+  view_kind: 1
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 31
+  title: Table
+  project_id: 8
+  view_kind: 2
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 32
+  title: Kanban
+  project_id: 8
+  view_kind: 3
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+  bucket_configuration_mode: 1
+- id: 33
+  title: List
+  project_id: 9
+  view_kind: 0
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 34
+  title: Gantt
+  project_id: 9
+  view_kind: 1
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 35
+  title: Table
+  project_id: 9
+  view_kind: 2
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 36
+  title: Kanban
+  project_id: 9
+  view_kind: 3
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+  bucket_configuration_mode: 1
+- id: 37
+  title: List
+  project_id: 10
+  view_kind: 0
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 38
+  title: Gantt
+  project_id: 10
+  view_kind: 1
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 39
+  title: Table
+  project_id: 10
+  view_kind: 2
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 40
+  title: Kanban
+  project_id: 10
+  view_kind: 3
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+  bucket_configuration_mode: 1
+- id: 41
+  title: List
+  project_id: 11
+  view_kind: 0
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 42
+  title: Gantt
+  project_id: 11
+  view_kind: 1
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 43
+  title: Table
+  project_id: 11
+  view_kind: 2
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 44
+  title: Kanban
+  project_id: 11
+  view_kind: 3
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+  bucket_configuration_mode: 1
+- id: 45
+  title: List
+  project_id: 12
+  view_kind: 0
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 46
+  title: Gantt
+  project_id: 12
+  view_kind: 1
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 47
+  title: Table
+  project_id: 12
+  view_kind: 2
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 48
+  title: Kanban
+  project_id: 12
+  view_kind: 3
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+  bucket_configuration_mode: 1
+- id: 49
+  title: List
+  project_id: 13
+  view_kind: 0
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 50
+  title: Gantt
+  project_id: 13
+  view_kind: 1
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 51
+  title: Table
+  project_id: 13
+  view_kind: 2
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 52
+  title: Kanban
+  project_id: 13
+  view_kind: 3
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+  bucket_configuration_mode: 1
+- id: 53
+  title: List
+  project_id: 14
+  view_kind: 0
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 54
+  title: Gantt
+  project_id: 14
+  view_kind: 1
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 55
+  title: Table
+  project_id: 14
+  view_kind: 2
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 56
+  title: Kanban
+  project_id: 14
+  view_kind: 3
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+  bucket_configuration_mode: 1
+- id: 57
+  title: List
+  project_id: 15
+  view_kind: 0
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 58
+  title: Gantt
+  project_id: 15
+  view_kind: 1
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 59
+  title: Table
+  project_id: 15
+  view_kind: 2
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 60
+  title: Kanban
+  project_id: 15
+  view_kind: 3
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+  bucket_configuration_mode: 1
+- id: 61
+  title: List
+  project_id: 16
+  view_kind: 0
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 62
+  title: Gantt
+  project_id: 16
+  view_kind: 1
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 63
+  title: Table
+  project_id: 16
+  view_kind: 2
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 64
+  title: Kanban
+  project_id: 16
+  view_kind: 3
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+  bucket_configuration_mode: 1
+- id: 65
+  title: List
+  project_id: 17
+  view_kind: 0
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 66
+  title: Gantt
+  project_id: 17
+  view_kind: 1
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 67
+  title: Table
+  project_id: 17
+  view_kind: 2
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 68
+  title: Kanban
+  project_id: 17
+  view_kind: 3
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+  bucket_configuration_mode: 1
+- id: 69
+  title: List
+  project_id: 18
+  view_kind: 0
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 70
+  title: Gantt
+  project_id: 18
+  view_kind: 1
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 71
+  title: Table
+  project_id: 18
+  view_kind: 2
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 72
+  title: Kanban
+  project_id: 18
+  view_kind: 3
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+  bucket_configuration_mode: 1
+- id: 73
+  title: List
+  project_id: 19
+  view_kind: 0
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 74
+  title: Gantt
+  project_id: 19
+  view_kind: 1
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 75
+  title: Table
+  project_id: 19
+  view_kind: 2
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 76
+  title: Kanban
+  project_id: 19
+  view_kind: 3
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+  bucket_configuration_mode: 1
+- id: 77
+  title: List
+  project_id: 20
+  view_kind: 0
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 78
+  title: Gantt
+  project_id: 20
+  view_kind: 1
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 79
+  title: Table
+  project_id: 20
+  view_kind: 2
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 80
+  title: Kanban
+  project_id: 20
+  view_kind: 3
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+  bucket_configuration_mode: 1
+- id: 81
+  title: List
+  project_id: 21
+  view_kind: 0
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 82
+  title: Gantt
+  project_id: 21
+  view_kind: 1
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 83
+  title: Table
+  project_id: 21
+  view_kind: 2
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 84
+  title: Kanban
+  project_id: 21
+  view_kind: 3
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+  bucket_configuration_mode: 1
+- id: 85
+  title: List
+  project_id: 22
+  view_kind: 0
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 86
+  title: Gantt
+  project_id: 22
+  view_kind: 1
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 87
+  title: Table
+  project_id: 22
+  view_kind: 2
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 88
+  title: Kanban
+  project_id: 22
+  view_kind: 3
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+  bucket_configuration_mode: 1
+- id: 89
+  title: List
+  project_id: 23
+  view_kind: 0
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 90
+  title: Gantt
+  project_id: 23
+  view_kind: 1
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 91
+  title: Table
+  project_id: 23
+  view_kind: 2
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 92
+  title: Kanban
+  project_id: 23
+  view_kind: 3
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+  bucket_configuration_mode: 1
+- id: 93
+  title: List
+  project_id: 24
+  view_kind: 0
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 94
+  title: Gantt
+  project_id: 24
+  view_kind: 1
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 95
+  title: Table
+  project_id: 24
+  view_kind: 2
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 96
+  title: Kanban
+  project_id: 24
+  view_kind: 3
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+  bucket_configuration_mode: 1
+- id: 97
+  title: List
+  project_id: 25
+  view_kind: 0
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 98
+  title: Gantt
+  project_id: 25
+  view_kind: 1
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 99
+  title: Table
+  project_id: 25
+  view_kind: 2
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 100
+  title: Kanban
+  project_id: 25
+  view_kind: 3
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+  bucket_configuration_mode: 1
+- id: 101
+  title: List
+  project_id: 26
+  view_kind: 0
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 102
+  title: Gantt
+  project_id: 26
+  view_kind: 1
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 103
+  title: Table
+  project_id: 26
+  view_kind: 2
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 104
+  title: Kanban
+  project_id: 26
+  view_kind: 3
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+  bucket_configuration_mode: 1
+- id: 105
+  title: List
+  project_id: 27
+  view_kind: 0
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 106
+  title: Gantt
+  project_id: 27
+  view_kind: 1
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 107
+  title: Table
+  project_id: 27
+  view_kind: 2
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 108
+  title: Kanban
+  project_id: 27
+  view_kind: 3
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+  bucket_configuration_mode: 1
+- id: 109
+  title: List
+  project_id: 28
+  view_kind: 0
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 110
+  title: Gantt
+  project_id: 28
+  view_kind: 1
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 111
+  title: Table
+  project_id: 28
+  view_kind: 2
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 112
+  title: Kanban
+  project_id: 28
+  view_kind: 3
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+  bucket_configuration_mode: 1
+- id: 113
+  title: List
+  project_id: 29
+  view_kind: 0
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 114
+  title: Gantt
+  project_id: 29
+  view_kind: 1
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 115
+  title: Table
+  project_id: 29
+  view_kind: 2
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 116
+  title: Kanban
+  project_id: 29
+  view_kind: 3
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+  bucket_configuration_mode: 1
+- id: 117
+  title: List
+  project_id: 30
+  view_kind: 0
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 118
+  title: Gantt
+  project_id: 30
+  view_kind: 1
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 119
+  title: Table
+  project_id: 30
+  view_kind: 2
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 120
+  title: Kanban
+  project_id: 30
+  view_kind: 3
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+  bucket_configuration_mode: 1
+- id: 121
+  title: List
+  project_id: 31
+  view_kind: 0
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 122
+  title: Gantt
+  project_id: 31
+  view_kind: 1
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 123
+  title: Table
+  project_id: 31
+  view_kind: 2
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 124
+  title: Kanban
+  project_id: 31
+  view_kind: 3
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+  bucket_configuration_mode: 1
+- id: 125
+  title: List
+  project_id: 32
+  view_kind: 0
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 126
+  title: Gantt
+  project_id: 32
+  view_kind: 1
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 127
+  title: Table
+  project_id: 32
+  view_kind: 2
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 128
+  title: Kanban
+  project_id: 32
+  view_kind: 3
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+  bucket_configuration_mode: 1
+- id: 129
+  title: List
+  project_id: 33
+  view_kind: 0
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 130
+  title: Gantt
+  project_id: 33
+  view_kind: 1
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 131
+  title: Table
+  project_id: 33
+  view_kind: 2
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 132
+  title: Kanban
+  project_id: 33
+  view_kind: 3
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+  bucket_configuration_mode: 1
+- id: 133
+  title: List
+  project_id: 34
+  view_kind: 0
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 134
+  title: Gantt
+  project_id: 34
+  view_kind: 1
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 135
+  title: Table
+  project_id: 34
+  view_kind: 2
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 136
+  title: Kanban
+  project_id: 34
+  view_kind: 3
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+  bucket_configuration_mode: 1
+- id: 137
+  title: List
+  project_id: 35
+  view_kind: 0
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 138
+  title: Gantt
+  project_id: 35
+  view_kind: 1
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 139
+  title: Table
+  project_id: 35
+  view_kind: 2
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 140
+  title: Kanban
+  project_id: 35
+  view_kind: 3
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+  bucket_configuration_mode: 1
+- id: 141
+  title: List
+  project_id: 36
+  view_kind: 0
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 142
+  title: Gantt
+  project_id: 36
+  view_kind: 1
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 143
+  title: Table
+  project_id: 36
+  view_kind: 2
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 144
+  title: Kanban
+  project_id: 36
+  view_kind: 3
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+  bucket_configuration_mode: 1
+- id: 145
+  title: List
+  project_id: 37
+  view_kind: 0
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 146
+  title: Gantt
+  project_id: 37
+  view_kind: 1
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 147
+  title: Table
+  project_id: 37
+  view_kind: 2
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 148
+  title: Kanban
+  project_id: 37
+  view_kind: 3
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+  bucket_configuration_mode: 1
+- id: 149
+  title: List
+  project_id: 38
+  view_kind: 0
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 150
+  title: Gantt
+  project_id: 38
+  view_kind: 1
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 151
+  title: Table
+  project_id: 38
+  view_kind: 2
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+- id: 152
+  title: Kanban
+  project_id: 38
+  view_kind: 3
+  updated: '2024-03-18 15:14:13'
+  created: '2018-03-18 15:14:13'
+  bucket_configuration_mode: 1
\ No newline at end of file
diff --git a/pkg/db/fixtures/projects.yml b/pkg/db/fixtures/projects.yml
index b42944d84..f16622d93 100644
--- a/pkg/db/fixtures/projects.yml
+++ b/pkg/db/fixtures/projects.yml
@@ -5,7 +5,6 @@
   identifier: test1
   owner_id: 1
   position: 3
-  done_bucket_id: 3
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
 -
@@ -15,8 +14,6 @@
   identifier: test2
   owner_id: 3
   position: 2
-  done_bucket_id: 4
-  default_bucket_id: 40
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
 -
@@ -53,7 +50,6 @@
   identifier: test6
   owner_id: 6
   position: 6
-  default_bucket_id: 22
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
 -
diff --git a/pkg/db/fixtures/task_buckets.yml b/pkg/db/fixtures/task_buckets.yml
new file mode 100644
index 000000000..390a7d6ad
--- /dev/null
+++ b/pkg/db/fixtures/task_buckets.yml
@@ -0,0 +1,138 @@
+- task_id: 1
+  project_view_id: 4
+  bucket_id: 1
+- task_id: 2
+  project_view_id: 4
+  bucket_id: 1
+- task_id: 3
+  project_view_id: 4
+  bucket_id: 2
+- task_id: 4
+  project_view_id: 4
+  bucket_id: 2
+- task_id: 5
+  project_view_id: 4
+  bucket_id: 2
+- task_id: 6
+  project_view_id: 4
+  bucket_id: 3
+- task_id: 7
+  project_view_id: 4
+  bucket_id: 3
+- task_id: 8
+  project_view_id: 4
+  bucket_id: 3
+- task_id: 9
+  project_view_id: 4
+  bucket_id: 1
+- task_id: 10
+  project_view_id: 4
+  bucket_id: 1
+- task_id: 11
+  project_view_id: 4
+  bucket_id: 1
+- task_id: 12
+  project_view_id: 4
+  bucket_id: 1
+- task_id: 13
+  project_view_id: 8
+  bucket_id: 4
+- task_id: 14
+  project_view_id: 20
+  bucket_id: 18
+- task_id: 15
+  project_view_id: 24
+  bucket_id: 6
+- task_id: 16
+  project_view_id: 28
+  bucket_id: 7
+- task_id: 17
+  project_view_id: 32
+  bucket_id: 8
+- task_id: 18
+  project_view_id: 36
+  bucket_id: 9
+- task_id: 19
+  project_view_id: 40
+  bucket_id: 10
+- task_id: 20
+  project_view_id: 44
+  bucket_id: 11
+- task_id: 21
+  project_view_id: 128
+  bucket_id: 12
+- task_id: 22
+  project_view_id: 132
+  bucket_id: 36
+- task_id: 23
+  project_view_id: 136
+  bucket_id: 37
+- task_id: 24
+  project_view_id: 60
+  bucket_id: 15
+- task_id: 25
+  project_view_id: 64
+  bucket_id: 16
+- task_id: 26
+  project_view_id: 68
+  bucket_id: 17
+- task_id: 27
+  project_view_id: 4
+  bucket_id: 1
+- task_id: 28
+  project_view_id: 4
+  bucket_id: 1
+- task_id: 29
+  project_view_id: 4
+  bucket_id: 1
+- task_id: 30
+  project_view_id: 4
+  bucket_id: 1
+- task_id: 31
+  project_view_id: 4
+  bucket_id: 1
+- task_id: 32
+  project_view_id: 12
+  bucket_id: 21
+- task_id: 33
+  project_view_id: 4
+  bucket_id: 1
+- task_id: 34
+  project_view_id: 80
+  bucket_id: 5
+- task_id: 35
+  project_view_id: 84
+  bucket_id: 19
+- task_id: 36
+  project_view_id: 88
+  bucket_id: 20
+#- task_id: 37
+#  project_view_id: 8
+#  bucket_id: null
+#- task_id: 38
+#  project_view_id: 88
+#  bucket_id: null
+#- task_id: 39
+#  project_view_id: 100
+#  bucket_id: null
+- task_id: 40
+  project_view_id: 144
+  bucket_id: 38
+- task_id: 41
+  project_view_id: 144
+  bucket_id: 38
+- task_id: 42
+  project_view_id: 144
+  bucket_id: 38
+- task_id: 43
+  project_view_id: 144
+  bucket_id: 38
+- task_id: 44
+  project_view_id: 152
+  bucket_id: 38
+- task_id: 45
+  project_view_id: 144
+  bucket_id: 38
+- task_id: 46
+  project_view_id: 152
+  bucket_id: 38
diff --git a/pkg/db/fixtures/task_positions.yml b/pkg/db/fixtures/task_positions.yml
new file mode 100644
index 000000000..08e118305
--- /dev/null
+++ b/pkg/db/fixtures/task_positions.yml
@@ -0,0 +1,138 @@
+- task_id: 1
+  project_view_id: 1
+  position: 2
+- task_id: 2
+  project_view_id: 1
+  position: 4
+#- task_id: 3
+#  project_view_id: 1
+#  position: null
+#- task_id: 4
+#  project_view_id: 1
+#  position: null
+#- task_id: 5
+#  project_view_id: 1
+#  position: null
+#- task_id: 6
+#  project_view_id: 1
+#  position: null
+#- task_id: 7
+#  project_view_id: 1
+#  position: null
+#- task_id: 8
+#  project_view_id: 1
+#  position: null
+#- task_id: 9
+#  project_view_id: 1
+#  position: null
+#- task_id: 10
+#  project_view_id: 1
+#  position: null
+#- task_id: 11
+#  project_view_id: 1
+#  position: null
+#- task_id: 12
+#  project_view_id: 1
+#  position: null
+#- task_id: 13
+#  project_view_id: 2
+#  position: null
+#- task_id: 14
+#  project_view_id: 5
+#  position: null
+#- task_id: 15
+#  project_view_id: 6
+#  position: null
+#- task_id: 16
+#  project_view_id: 7
+#  position: null
+#- task_id: 17
+#  project_view_id: 8
+#  position: null
+#- task_id: 18
+#  project_view_id: 9
+#  position: null
+#- task_id: 19
+#  project_view_id: 10
+#  position: null
+#- task_id: 20
+#  project_view_id: 11
+#  position: null
+#- task_id: 21
+#  project_view_id: 32
+#  position: null
+#- task_id: 22
+#  project_view_id: 33
+#  position: null
+#- task_id: 23
+#  project_view_id: 34
+#  position: null
+#- task_id: 24
+#  project_view_id: 15
+#  position: null
+#- task_id: 25
+#  project_view_id: 16
+#  position: null
+#- task_id: 26
+#  project_view_id: 17
+#  position: null
+#- task_id: 27
+#  project_view_id: 1
+#  position: null
+#- task_id: 28
+#  project_view_id: 1
+#  position: null
+#- task_id: 29
+#  project_view_id: 1
+#  position: null
+#- task_id: 30
+#  project_view_id: 1
+#  position: null
+#- task_id: 31
+#  project_view_id: 1
+#  position: null
+#- task_id: 32
+#  project_view_id: 3
+#  position: null
+#- task_id: 33
+#  project_view_id: 1
+#  position: null
+#- task_id: 34
+#  project_view_id: 20
+#  position: null
+- task_id: 35
+  project_view_id: 21
+  position: 0
+#- task_id: 36
+#  project_view_id: 22
+#  position: null
+#- task_id: 37
+#  project_view_id: 2
+#  position: null
+#- task_id: 38
+#  project_view_id: 22
+#  position: null
+- task_id: 39
+  project_view_id: 25
+  position: 0
+- task_id: 40
+  project_view_id: 36
+  position: 39
+- task_id: 41
+  project_view_id: 36
+  position: 40
+- task_id: 42
+  project_view_id: 36
+  position: 41
+- task_id: 43
+  project_view_id: 36
+  position: 42
+- task_id: 44
+  project_view_id: 38
+  position: 43
+- task_id: 45
+  project_view_id: 36
+  position: 44
+- task_id: 46
+  project_view_id: 38
+  position: 45
diff --git a/pkg/db/fixtures/tasks.yml b/pkg/db/fixtures/tasks.yml
index fe636fb10..7657c2bb6 100644
--- a/pkg/db/fixtures/tasks.yml
+++ b/pkg/db/fixtures/tasks.yml
@@ -7,8 +7,6 @@
   index: 1
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
-  bucket_id: 1
-  position: 2
 - id: 2
   title: 'task #2 done'
   done: true
@@ -17,8 +15,6 @@
   index: 2
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
-  bucket_id: 1
-  position: 4
 - id: 3
   title: 'task #3 high prio'
   done: false
@@ -28,7 +24,6 @@
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
   priority: 100
-  bucket_id: 2
 - id: 4
   title: 'task #4 low prio'
   done: false
@@ -38,7 +33,6 @@
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
   priority: 1
-  bucket_id: 2
 - id: 5
   title: 'task #5 higher due date'
   done: false
@@ -48,7 +42,6 @@
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
   due_date: 2018-12-01 03:58:44
-  bucket_id: 2
 - id: 6
   title: 'task #6 lower due date'
   done: false
@@ -58,7 +51,6 @@
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
   due_date: 2018-11-30 22:25:24
-  bucket_id: 3
 - id: 7
   title: 'task #7 with start date'
   done: false
@@ -68,7 +60,6 @@
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
   start_date: 2018-12-12 07:33:20
-  bucket_id: 3
 - id: 8
   title: 'task #8 with end date'
   done: false
@@ -78,7 +69,6 @@
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
   end_date: 2018-12-13 11:20:00
-  bucket_id: 3
 - id: 9
   title: 'task #9 with start and end date'
   done: false
@@ -89,14 +79,12 @@
   updated: 2018-12-01 01:12:04
   start_date: 2018-12-12 07:33:20
   end_date: 2018-12-13 11:20:00
-  bucket_id: 1
 - id: 10
   title: 'task #10 basic'
   done: false
   created_by_id: 1
   project_id: 1
   index: 10
-  bucket_id: 1
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
 - id: 11
@@ -105,7 +93,6 @@
   created_by_id: 1
   project_id: 1
   index: 11
-  bucket_id: 1
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
 - id: 12
@@ -114,7 +101,6 @@
   created_by_id: 1
   project_id: 1
   index: 12
-  bucket_id: 1
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
 - id: 13
@@ -123,7 +109,6 @@
   created_by_id: 1
   project_id: 2
   index: 1
-  bucket_id: 4
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
 - id: 14
@@ -132,7 +117,6 @@
   created_by_id: 5
   project_id: 5
   index: 1
-  bucket_id: 18
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
 - id: 15
@@ -141,7 +125,6 @@
   created_by_id: 6
   project_id: 6
   index: 1
-  bucket_id: 6
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
 - id: 16
@@ -150,7 +133,6 @@
   created_by_id: 6
   project_id: 7
   index: 1
-  bucket_id: 7
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
 - id: 17
@@ -159,7 +141,6 @@
   created_by_id: 6
   project_id: 8
   index: 1
-  bucket_id: 8
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
 - id: 18
@@ -168,7 +149,6 @@
   created_by_id: 6
   project_id: 9
   index: 1
-  bucket_id: 9
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
 - id: 19
@@ -177,7 +157,6 @@
   created_by_id: 6
   project_id: 10
   index: 1
-  bucket_id: 10
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
 - id: 20
@@ -186,7 +165,6 @@
   created_by_id: 6
   project_id: 11
   index: 1
-  bucket_id: 11
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
 - id: 21
@@ -195,7 +173,6 @@
   created_by_id: 6
   project_id: 32
   index: 1
-  bucket_id: 12
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
 - id: 22
@@ -204,7 +181,6 @@
   created_by_id: 6
   project_id: 33
   index: 1
-  bucket_id: 36
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
 - id: 23
@@ -213,7 +189,6 @@
   created_by_id: 6
   project_id: 34
   index: 1
-  bucket_id: 37
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
 - id: 24
@@ -222,7 +197,6 @@
   created_by_id: 6
   project_id: 15
   index: 1
-  bucket_id: 15
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
 - id: 25
@@ -231,7 +205,6 @@
   created_by_id: 6
   project_id: 16
   index: 1
-  bucket_id: 16
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
 - id: 26
@@ -240,7 +213,6 @@
   created_by_id: 6
   project_id: 17
   index: 1
-  bucket_id: 17
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
 - id: 27
@@ -249,7 +221,6 @@
   created_by_id: 1
   project_id: 1
   index: 12
-  bucket_id: 1
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
   start_date: 2018-11-30 22:25:24
@@ -260,7 +231,6 @@
   repeat_after: 3600
   project_id: 1
   index: 13
-  bucket_id: 1
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
 - id: 29
@@ -269,7 +239,6 @@
   created_by_id: 1
   project_id: 1
   index: 14
-  bucket_id: 1
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
 - id: 30
@@ -278,7 +247,6 @@
   created_by_id: 1
   project_id: 1
   index: 15
-  bucket_id: 1
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
 - id: 31
@@ -288,7 +256,6 @@
   project_id: 1
   index: 16
   hex_color: f0f0f0
-  bucket_id: 1
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
 - id: 32
@@ -297,7 +264,6 @@
   created_by_id: 1
   project_id: 3
   index: 1
-  bucket_id: 21
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
 - id: 33
@@ -307,7 +273,6 @@
   project_id: 1
   index: 17
   percent_done: 0.5
-  bucket_id: 1
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
   # This task is forbidden for user1
@@ -317,7 +282,6 @@
   created_by_id: 13
   project_id: 20
   index: 20
-  bucket_id: 5
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
 - id: 35
@@ -326,7 +290,6 @@
   created_by_id: 1
   project_id: 21
   index: 1
-  bucket_id: 19
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
 - id: 36
@@ -335,7 +298,6 @@
   created_by_id: 1
   project_id: 22
   index: 1
-  bucket_id: 20
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
   due_date: 2018-10-30 22:25:24
@@ -374,8 +336,6 @@
   due_date: 2023-03-01 15:00:00
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
-  bucket_id: 38
-  position: 39
 - id: 41
   uid: 'uid-caldav-test-parent-task'
   title: 'Parent task for Caldav Test'
@@ -388,8 +348,6 @@
   due_date: 2023-03-01 15:00:00
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
-  bucket_id: 38
-  position: 40
 - id: 42
   uid: 'uid-caldav-test-parent-task-2'
   title: 'Parent task for Caldav Test 2'
@@ -402,8 +360,6 @@
   due_date: 2023-03-01 15:00:00
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
-  bucket_id: 38
-  position: 41
 - id: 43
   uid: 'uid-caldav-test-child-task'
   title: 'Child task for Caldav Test'
@@ -416,8 +372,6 @@
   due_date: 2023-03-01 15:00:00
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
-  bucket_id: 38
-  position: 42
 - id: 44
   uid: 'uid-caldav-test-child-task-2'
   title: 'Child task for Caldav Test '
@@ -430,8 +384,6 @@
   due_date: 2023-03-01 15:00:00
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
-  bucket_id: 38
-  position: 43
 - id: 45
   uid: 'uid-caldav-test-parent-task-another-list'
   title: 'Parent task for Caldav Test'
@@ -444,8 +396,6 @@
   due_date: 2023-03-01 15:00:00
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
-  bucket_id: 38
-  position: 44
 - id: 46
   uid: 'uid-caldav-test-child-task-another-list'
   title: 'Child task for Caldav Test '
@@ -457,6 +407,4 @@
   index: 45
   due_date: 2023-03-01 15:00:00
   created: 2018-12-01 01:12:04
-  updated: 2018-12-01 01:12:04
-  bucket_id: 38
-  position: 45
\ No newline at end of file
+  updated: 2018-12-01 01:12:04
\ No newline at end of file
diff --git a/pkg/models/unit_tests.go b/pkg/models/unit_tests.go
index b8f0a99de..584fbe4ca 100644
--- a/pkg/models/unit_tests.go
+++ b/pkg/models/unit_tests.go
@@ -66,6 +66,9 @@ func SetupTests() {
 		"favorites",
 		"api_tokens",
 		"reactions",
+		"project_views",
+		"task_positions",
+		"task_buckets",
 	)
 	if err != nil {
 		log.Fatal(err)