diff --git a/lib/data/models/credit_model.dart b/lib/data/models/credit_model.dart
index b03408d5b..307912527 100644
--- a/lib/data/models/credit_model.dart
+++ b/lib/data/models/credit_model.dart
@@ -36,11 +36,30 @@ abstract class CreditItemResponse
 class CreditFields {
   static const String amount = 'amount';
   static const String balance = 'balance';
-  static const String creditDate = 'creditDate';
-  static const String creditNumber = 'creditNumber';
-  static const String privateNotes = 'privateNotes';
-  static const String publicNotes = 'publicNotes';
   static const String clientId = 'clientId';
+  static const String client = 'client';
+  static const String statusId = 'statusId';
+  static const String number = 'number';
+  static const String discount = 'discount';
+  static const String poNumber = 'poNumber';
+  static const String date = 'date';
+  static const String dueDate = 'dueDate';
+  static const String terms = 'terms';
+  static const String footer = 'invoiceFooter';
+  static const String partial = 'partial';
+  static const String partialDueDate = 'partialDueDate';
+  static const String publicNotes = 'publicNotes';
+  static const String privateNotes = 'privateNotes';
+  static const String invoiceTypeId = 'invoiceTypeId';
+  static const String isRecurring = 'isRecurring';
+  static const String frequencyId = 'frequencyId';
+  static const String startDate = 'startDate';
+  static const String endDate = 'endDate';
+
+  static const String customValue1 = 'customValue1';
+  static const String customValue2 = 'customValue2';
+  static const String customValue3 = 'customValue3';
+  static const String customValue4 = 'customValue4';
 
   static const String updatedAt = 'updatedAt';
   static const String archivedAt = 'archivedAt';
diff --git a/lib/data/models/quote_model.dart b/lib/data/models/quote_model.dart
index 5d2a90f7a..6742f6ab6 100644
--- a/lib/data/models/quote_model.dart
+++ b/lib/data/models/quote_model.dart
@@ -39,25 +39,30 @@ abstract class QuoteItemResponse
 class QuoteFields {
   static const String amount = 'amount';
   static const String balance = 'balance';
-  static const String client = 'client';
   static const String clientId = 'clientId';
+  static const String client = 'client';
   static const String statusId = 'statusId';
   static const String number = 'number';
   static const String discount = 'discount';
   static const String poNumber = 'poNumber';
   static const String date = 'date';
-  static const String dueDate = 'dueDate';
+  static const String validUntil = 'validUntil';
   static const String terms = 'terms';
+  static const String footer = 'invoiceFooter';
   static const String partial = 'partial';
   static const String partialDueDate = 'partialDueDate';
   static const String publicNotes = 'publicNotes';
   static const String privateNotes = 'privateNotes';
-  static const String quoteTypeId = 'quoteTypeId';
+  static const String invoiceTypeId = 'invoiceTypeId';
   static const String isRecurring = 'isRecurring';
   static const String frequencyId = 'frequencyId';
   static const String startDate = 'startDate';
   static const String endDate = 'endDate';
-  static const String validUntil = 'validUntil';
+
+  static const String customValue1 = 'customValue1';
+  static const String customValue2 = 'customValue2';
+  static const String customValue3 = 'customValue3';
+  static const String customValue4 = 'customValue4';
 
   static const String updatedAt = 'updatedAt';
   static const String archivedAt = 'archivedAt';
diff --git a/lib/redux/credit/credit_state.dart b/lib/redux/credit/credit_state.dart
index 8d4a5d8ae..e58c5482d 100644
--- a/lib/redux/credit/credit_state.dart
+++ b/lib/redux/credit/credit_state.dart
@@ -58,7 +58,7 @@ abstract class CreditUIState extends Object
     implements Built<CreditUIState, CreditUIStateBuilder> {
   factory CreditUIState() {
     return _$CreditUIState._(
-      listUIState: ListUIState(CreditFields.name),
+      listUIState: ListUIState(CreditFields.number),
       editing: InvoiceEntity(),
       selectedId: '',
     );
diff --git a/lib/ui/app/menu_drawer.dart b/lib/ui/app/menu_drawer.dart
index 7f16e7295..c8cc82791 100644
--- a/lib/ui/app/menu_drawer.dart
+++ b/lib/ui/app/menu_drawer.dart
@@ -259,12 +259,6 @@ class MenuDrawer extends StatelessWidget {
                           entityType: EntityType.credit,
                           icon: getEntityIcon(EntityType.credit),
                           title: localization.credits,
-                          onTap: () => store.dispatch(ViewcreditList(context)),
-                          onCreateTap: () {
-                            navigator.pop();
-                            store.dispatch(EditCredit(
-                                credit: InvoiceEntity(), context: context));
-                          },
                         ),
 
                         DrawerTile(
diff --git a/lib/ui/client/client_list.dart b/lib/ui/client/client_list.dart
index 75f250aa4..8b4f0c5e5 100644
--- a/lib/ui/client/client_list.dart
+++ b/lib/ui/client/client_list.dart
@@ -11,7 +11,7 @@ import 'package:invoiceninja_flutter/ui/app/help_text.dart';
 import 'package:invoiceninja_flutter/ui/app/lists/list_divider.dart';
 import 'package:invoiceninja_flutter/ui/app/loading_indicator.dart';
 import 'package:invoiceninja_flutter/ui/app/presenters/entity_presenter.dart';
-import 'package:invoiceninja_flutter/ui/app/presenters/client_presenter.dart';
+import 'file:///C:/Users/hillel/Documents/flutter-mobile/lib/ui/client/client_presenter.dart';
 import 'package:invoiceninja_flutter/ui/app/tables/entity_datatable.dart';
 import 'package:invoiceninja_flutter/ui/client/client_list_item.dart';
 import 'package:invoiceninja_flutter/ui/client/client_list_vm.dart';
diff --git a/lib/ui/client/client_list_vm.dart b/lib/ui/client/client_list_vm.dart
index ffa847394..deee10410 100644
--- a/lib/ui/client/client_list_vm.dart
+++ b/lib/ui/client/client_list_vm.dart
@@ -10,7 +10,7 @@ import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
 import 'package:invoiceninja_flutter/redux/app/app_state.dart';
 import 'package:invoiceninja_flutter/redux/client/client_actions.dart';
 import 'package:invoiceninja_flutter/redux/client/client_selectors.dart';
-import 'package:invoiceninja_flutter/ui/app/presenters/client_presenter.dart';
+import 'file:///C:/Users/hillel/Documents/flutter-mobile/lib/ui/client/client_presenter.dart';
 import 'package:invoiceninja_flutter/ui/client/client_list.dart';
 import 'package:invoiceninja_flutter/utils/completers.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
diff --git a/lib/ui/app/presenters/client_presenter.dart b/lib/ui/client/client_presenter.dart
similarity index 100%
rename from lib/ui/app/presenters/client_presenter.dart
rename to lib/ui/client/client_presenter.dart
diff --git a/lib/ui/credit/credit_list_vm.dart b/lib/ui/credit/credit_list_vm.dart
index d176028c8..7c0615709 100644
--- a/lib/ui/credit/credit_list_vm.dart
+++ b/lib/ui/credit/credit_list_vm.dart
@@ -35,6 +35,7 @@ class CreditListBuilder extends StatelessWidget {
 
 class CreditListVM {
   CreditListVM({
+    @required this.state,
     @required this.userCompany,
     @required this.creditList,
     @required this.creditMap,
@@ -64,6 +65,7 @@ class CreditListVM {
     final state = store.state;
 
     return CreditListVM(
+      state: state,
       userCompany: state.userCompany,
       listState: state.creditListState,
       creditList: memoizedFilteredCreditList(
@@ -91,6 +93,7 @@ class CreditListVM {
     );
   }
 
+  final AppState state;
   final UserCompanyEntity userCompany;
   final List<String> creditList;
   final BuiltMap<String, InvoiceEntity> creditMap;
diff --git a/lib/ui/credit/credit_presenter.dart b/lib/ui/credit/credit_presenter.dart
new file mode 100644
index 000000000..8f4e61af8
--- /dev/null
+++ b/lib/ui/credit/credit_presenter.dart
@@ -0,0 +1,25 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_redux/flutter_redux.dart';
+import 'package:invoiceninja_flutter/data/models/models.dart';
+import 'package:invoiceninja_flutter/data/models/credit_model.dart';
+import 'package:invoiceninja_flutter/redux/app/app_state.dart';
+import 'package:invoiceninja_flutter/ui/app/presenters/entity_presenter.dart';
+import 'package:invoiceninja_flutter/utils/formatting.dart';
+
+class CreditPresenter extends EntityPresenter {
+  static List<String> getTableFields(UserCompanyEntity userCompany) {
+    return [
+    ];
+  }
+
+  @override
+  Widget getField({String field, BuildContext context}) {
+    final state = StoreProvider.of<AppState>(context).state;
+    final credit = entity as InvoiceEntity;
+
+    switch (field) {
+    }
+
+    return super.getField(field: field, context: context);
+  }
+}
diff --git a/lib/ui/expense/expense_list.dart b/lib/ui/expense/expense_list.dart
index d4cec5b14..cb877f9a7 100644
--- a/lib/ui/expense/expense_list.dart
+++ b/lib/ui/expense/expense_list.dart
@@ -13,7 +13,7 @@ import 'package:invoiceninja_flutter/ui/app/lists/list_divider.dart';
 import 'package:invoiceninja_flutter/ui/app/lists/list_filter.dart';
 import 'package:invoiceninja_flutter/ui/app/loading_indicator.dart';
 import 'package:invoiceninja_flutter/ui/app/presenters/entity_presenter.dart';
-import 'package:invoiceninja_flutter/ui/app/presenters/expense_presenter.dart';
+import 'file:///C:/Users/hillel/Documents/flutter-mobile/lib/ui/expense/expense_presenter.dart';
 import 'package:invoiceninja_flutter/ui/app/tables/entity_datatable.dart';
 import 'package:invoiceninja_flutter/ui/expense/expense_list_item.dart';
 import 'package:invoiceninja_flutter/ui/expense/expense_list_vm.dart';
diff --git a/lib/ui/expense/expense_list_vm.dart b/lib/ui/expense/expense_list_vm.dart
index 8abe15592..c950d1adb 100644
--- a/lib/ui/expense/expense_list_vm.dart
+++ b/lib/ui/expense/expense_list_vm.dart
@@ -10,7 +10,7 @@ import 'package:invoiceninja_flutter/redux/app/app_state.dart';
 import 'package:invoiceninja_flutter/redux/expense/expense_actions.dart';
 import 'package:invoiceninja_flutter/redux/expense/expense_selectors.dart';
 import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart';
-import 'package:invoiceninja_flutter/ui/app/presenters/expense_presenter.dart';
+import 'file:///C:/Users/hillel/Documents/flutter-mobile/lib/ui/expense/expense_presenter.dart';
 import 'package:invoiceninja_flutter/ui/expense/expense_list.dart';
 import 'package:invoiceninja_flutter/utils/completers.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
diff --git a/lib/ui/app/presenters/expense_presenter.dart b/lib/ui/expense/expense_presenter.dart
similarity index 100%
rename from lib/ui/app/presenters/expense_presenter.dart
rename to lib/ui/expense/expense_presenter.dart
diff --git a/lib/ui/invoice/invoice_list.dart b/lib/ui/invoice/invoice_list.dart
index ee15036b8..e2b440d4e 100644
--- a/lib/ui/invoice/invoice_list.dart
+++ b/lib/ui/invoice/invoice_list.dart
@@ -13,7 +13,7 @@ import 'package:invoiceninja_flutter/ui/app/lists/list_divider.dart';
 import 'package:invoiceninja_flutter/ui/app/lists/list_filter.dart';
 import 'package:invoiceninja_flutter/ui/app/loading_indicator.dart';
 import 'package:invoiceninja_flutter/ui/app/presenters/entity_presenter.dart';
-import 'package:invoiceninja_flutter/ui/app/presenters/invoice_presenter.dart';
+import 'file:///C:/Users/hillel/Documents/flutter-mobile/lib/ui/invoice/invoice_presenter.dart';
 import 'package:invoiceninja_flutter/ui/app/tables/entity_datatable.dart';
 import 'package:invoiceninja_flutter/ui/invoice/invoice_list_item.dart';
 import 'package:invoiceninja_flutter/ui/invoice/invoice_list_vm.dart';
diff --git a/lib/ui/invoice/invoice_list_vm.dart b/lib/ui/invoice/invoice_list_vm.dart
index 32c35fea6..e8861e1ab 100644
--- a/lib/ui/invoice/invoice_list_vm.dart
+++ b/lib/ui/invoice/invoice_list_vm.dart
@@ -10,7 +10,7 @@ import 'package:invoiceninja_flutter/redux/app/app_state.dart';
 import 'package:invoiceninja_flutter/redux/invoice/invoice_actions.dart';
 import 'package:invoiceninja_flutter/redux/invoice/invoice_selectors.dart';
 import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart';
-import 'package:invoiceninja_flutter/ui/app/presenters/invoice_presenter.dart';
+import 'file:///C:/Users/hillel/Documents/flutter-mobile/lib/ui/invoice/invoice_presenter.dart';
 import 'package:invoiceninja_flutter/ui/invoice/invoice_list.dart';
 import 'package:invoiceninja_flutter/utils/completers.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
diff --git a/lib/ui/app/presenters/invoice_presenter.dart b/lib/ui/invoice/invoice_presenter.dart
similarity index 100%
rename from lib/ui/app/presenters/invoice_presenter.dart
rename to lib/ui/invoice/invoice_presenter.dart
diff --git a/lib/ui/payment/payment_list.dart b/lib/ui/payment/payment_list.dart
index 4ca097a8a..156024623 100644
--- a/lib/ui/payment/payment_list.dart
+++ b/lib/ui/payment/payment_list.dart
@@ -12,7 +12,7 @@ import 'package:invoiceninja_flutter/ui/app/lists/list_divider.dart';
 import 'package:invoiceninja_flutter/ui/app/lists/list_filter.dart';
 import 'package:invoiceninja_flutter/ui/app/loading_indicator.dart';
 import 'package:invoiceninja_flutter/ui/app/presenters/entity_presenter.dart';
-import 'package:invoiceninja_flutter/ui/app/presenters/payment_presenter.dart';
+import 'file:///C:/Users/hillel/Documents/flutter-mobile/lib/ui/payment/payment_presenter.dart';
 import 'package:invoiceninja_flutter/ui/app/tables/entity_datatable.dart';
 import 'package:invoiceninja_flutter/ui/payment/payment_list_item.dart';
 import 'package:invoiceninja_flutter/ui/payment/payment_list_vm.dart';
diff --git a/lib/ui/payment/payment_list_vm.dart b/lib/ui/payment/payment_list_vm.dart
index 3de4e16a5..fb7727d36 100644
--- a/lib/ui/payment/payment_list_vm.dart
+++ b/lib/ui/payment/payment_list_vm.dart
@@ -11,7 +11,7 @@ import 'package:invoiceninja_flutter/redux/app/app_state.dart';
 import 'package:invoiceninja_flutter/redux/payment/payment_actions.dart';
 import 'package:invoiceninja_flutter/redux/payment/payment_selectors.dart';
 import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart';
-import 'package:invoiceninja_flutter/ui/app/presenters/payment_presenter.dart';
+import 'file:///C:/Users/hillel/Documents/flutter-mobile/lib/ui/payment/payment_presenter.dart';
 import 'package:invoiceninja_flutter/ui/payment/payment_list.dart';
 import 'package:invoiceninja_flutter/utils/completers.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
diff --git a/lib/ui/app/presenters/payment_presenter.dart b/lib/ui/payment/payment_presenter.dart
similarity index 100%
rename from lib/ui/app/presenters/payment_presenter.dart
rename to lib/ui/payment/payment_presenter.dart
diff --git a/lib/ui/product/product_list.dart b/lib/ui/product/product_list.dart
index 13fbee995..953381ffe 100644
--- a/lib/ui/product/product_list.dart
+++ b/lib/ui/product/product_list.dart
@@ -11,7 +11,7 @@ import 'package:invoiceninja_flutter/ui/app/help_text.dart';
 import 'package:invoiceninja_flutter/ui/app/lists/list_divider.dart';
 import 'package:invoiceninja_flutter/ui/app/loading_indicator.dart';
 import 'package:invoiceninja_flutter/ui/app/presenters/entity_presenter.dart';
-import 'package:invoiceninja_flutter/ui/app/presenters/product_presenter.dart';
+import 'file:///C:/Users/hillel/Documents/flutter-mobile/lib/ui/product/product_presenter.dart';
 import 'package:invoiceninja_flutter/ui/app/tables/entity_datatable.dart';
 import 'package:invoiceninja_flutter/ui/product/product_list_item.dart';
 import 'package:invoiceninja_flutter/ui/product/product_list_vm.dart';
diff --git a/lib/ui/product/product_list_vm.dart b/lib/ui/product/product_list_vm.dart
index 3fe0ed595..643cdc55e 100644
--- a/lib/ui/product/product_list_vm.dart
+++ b/lib/ui/product/product_list_vm.dart
@@ -10,7 +10,7 @@ import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
 import 'package:invoiceninja_flutter/redux/app/app_state.dart';
 import 'package:invoiceninja_flutter/redux/product/product_actions.dart';
 import 'package:invoiceninja_flutter/redux/product/product_selectors.dart';
-import 'package:invoiceninja_flutter/ui/app/presenters/product_presenter.dart';
+import 'file:///C:/Users/hillel/Documents/flutter-mobile/lib/ui/product/product_presenter.dart';
 import 'package:invoiceninja_flutter/ui/product/product_list.dart';
 import 'package:invoiceninja_flutter/utils/completers.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
diff --git a/lib/ui/app/presenters/product_presenter.dart b/lib/ui/product/product_presenter.dart
similarity index 100%
rename from lib/ui/app/presenters/product_presenter.dart
rename to lib/ui/product/product_presenter.dart
diff --git a/lib/ui/project/project_list.dart b/lib/ui/project/project_list.dart
index 6544e7f10..c65891ad9 100644
--- a/lib/ui/project/project_list.dart
+++ b/lib/ui/project/project_list.dart
@@ -12,7 +12,7 @@ import 'package:invoiceninja_flutter/ui/app/lists/list_divider.dart';
 import 'package:invoiceninja_flutter/ui/app/lists/list_filter.dart';
 import 'package:invoiceninja_flutter/ui/app/loading_indicator.dart';
 import 'package:invoiceninja_flutter/ui/app/presenters/entity_presenter.dart';
-import 'package:invoiceninja_flutter/ui/app/presenters/project_presenter.dart';
+import 'file:///C:/Users/hillel/Documents/flutter-mobile/lib/ui/project/project_presenter.dart';
 import 'package:invoiceninja_flutter/ui/app/tables/entity_datatable.dart';
 import 'package:invoiceninja_flutter/ui/project/project_list_item.dart';
 import 'package:invoiceninja_flutter/ui/project/project_list_vm.dart';
diff --git a/lib/ui/project/project_list_vm.dart b/lib/ui/project/project_list_vm.dart
index 742473bf2..1c26c81bc 100644
--- a/lib/ui/project/project_list_vm.dart
+++ b/lib/ui/project/project_list_vm.dart
@@ -11,7 +11,7 @@ import 'package:invoiceninja_flutter/redux/app/app_state.dart';
 import 'package:invoiceninja_flutter/redux/project/project_actions.dart';
 import 'package:invoiceninja_flutter/redux/project/project_selectors.dart';
 import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart';
-import 'package:invoiceninja_flutter/ui/app/presenters/project_presenter.dart';
+import 'file:///C:/Users/hillel/Documents/flutter-mobile/lib/ui/project/project_presenter.dart';
 import 'package:invoiceninja_flutter/ui/project/project_list.dart';
 import 'package:invoiceninja_flutter/utils/completers.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
diff --git a/lib/ui/app/presenters/project_presenter.dart b/lib/ui/project/project_presenter.dart
similarity index 100%
rename from lib/ui/app/presenters/project_presenter.dart
rename to lib/ui/project/project_presenter.dart
diff --git a/lib/ui/quote/quote_list_vm.dart b/lib/ui/quote/quote_list_vm.dart
index fb9f618d5..cdd332cc7 100644
--- a/lib/ui/quote/quote_list_vm.dart
+++ b/lib/ui/quote/quote_list_vm.dart
@@ -8,7 +8,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart';
-import 'package:invoiceninja_flutter/ui/app/presenters/quote_presenter.dart';
+import 'file:///C:/Users/hillel/Documents/flutter-mobile/lib/ui/quote/quote_presenter.dart';
 import 'package:invoiceninja_flutter/ui/invoice/invoice_list.dart';
 import 'package:invoiceninja_flutter/ui/invoice/invoice_list_vm.dart';
 import 'package:invoiceninja_flutter/utils/completers.dart';
diff --git a/lib/ui/app/presenters/quote_presenter.dart b/lib/ui/quote/quote_presenter.dart
similarity index 95%
rename from lib/ui/app/presenters/quote_presenter.dart
rename to lib/ui/quote/quote_presenter.dart
index bd6951dbb..2db26cff9 100644
--- a/lib/ui/app/presenters/quote_presenter.dart
+++ b/lib/ui/quote/quote_presenter.dart
@@ -14,7 +14,7 @@ class QuotePresenter extends EntityPresenter {
       QuoteFields.date,
       QuoteFields.amount,
       QuoteFields.balance,
-      QuoteFields.dueDate,
+      QuoteFields.validUntil,
       EntityFields.state,
     ];
   }
@@ -37,7 +37,7 @@ class QuotePresenter extends EntityPresenter {
         return Text(formatNumber(quote.amount, context));
       case QuoteFields.balance:
         return Text(formatNumber(quote.balance, context));
-      case QuoteFields.dueDate:
+      case QuoteFields.validUntil:
         return Text(formatDate(quote.dueDate, context));
     }
 
diff --git a/lib/ui/task/task_list.dart b/lib/ui/task/task_list.dart
index d3567e7c1..6b383a75b 100644
--- a/lib/ui/task/task_list.dart
+++ b/lib/ui/task/task_list.dart
@@ -12,7 +12,7 @@ import 'package:invoiceninja_flutter/ui/app/lists/list_divider.dart';
 import 'package:invoiceninja_flutter/ui/app/lists/list_filter.dart';
 import 'package:invoiceninja_flutter/ui/app/loading_indicator.dart';
 import 'package:invoiceninja_flutter/ui/app/presenters/entity_presenter.dart';
-import 'package:invoiceninja_flutter/ui/app/presenters/task_presenter.dart';
+import 'file:///C:/Users/hillel/Documents/flutter-mobile/lib/ui/task/task_presenter.dart';
 import 'package:invoiceninja_flutter/ui/app/tables/entity_datatable.dart';
 import 'package:invoiceninja_flutter/ui/task/task_list_item.dart';
 import 'package:invoiceninja_flutter/ui/task/task_list_vm.dart';
diff --git a/lib/ui/task/task_list_vm.dart b/lib/ui/task/task_list_vm.dart
index 89ebca1bb..63137af1a 100644
--- a/lib/ui/task/task_list_vm.dart
+++ b/lib/ui/task/task_list_vm.dart
@@ -11,7 +11,7 @@ import 'package:invoiceninja_flutter/redux/app/app_state.dart';
 import 'package:invoiceninja_flutter/redux/task/task_actions.dart';
 import 'package:invoiceninja_flutter/redux/task/task_selectors.dart';
 import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart';
-import 'package:invoiceninja_flutter/ui/app/presenters/task_presenter.dart';
+import 'file:///C:/Users/hillel/Documents/flutter-mobile/lib/ui/task/task_presenter.dart';
 import 'package:invoiceninja_flutter/ui/task/task_list.dart';
 import 'package:invoiceninja_flutter/utils/completers.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
diff --git a/lib/ui/app/presenters/task_presenter.dart b/lib/ui/task/task_presenter.dart
similarity index 100%
rename from lib/ui/app/presenters/task_presenter.dart
rename to lib/ui/task/task_presenter.dart
diff --git a/lib/ui/vendor/vendor_list.dart b/lib/ui/vendor/vendor_list.dart
index 7325cf5e5..4273345fd 100644
--- a/lib/ui/vendor/vendor_list.dart
+++ b/lib/ui/vendor/vendor_list.dart
@@ -11,7 +11,7 @@ import 'package:invoiceninja_flutter/ui/app/help_text.dart';
 import 'package:invoiceninja_flutter/ui/app/lists/list_divider.dart';
 import 'package:invoiceninja_flutter/ui/app/loading_indicator.dart';
 import 'package:invoiceninja_flutter/ui/app/presenters/entity_presenter.dart';
-import 'package:invoiceninja_flutter/ui/app/presenters/vendor_presenter.dart';
+import 'file:///C:/Users/hillel/Documents/flutter-mobile/lib/ui/vendor/vendor_presenter.dart';
 import 'package:invoiceninja_flutter/ui/app/tables/entity_datatable.dart';
 import 'package:invoiceninja_flutter/ui/vendor/vendor_list_item.dart';
 import 'package:invoiceninja_flutter/ui/vendor/vendor_list_vm.dart';
diff --git a/lib/ui/vendor/vendor_list_vm.dart b/lib/ui/vendor/vendor_list_vm.dart
index 1d7ba9b1e..5c6db74f8 100644
--- a/lib/ui/vendor/vendor_list_vm.dart
+++ b/lib/ui/vendor/vendor_list_vm.dart
@@ -10,7 +10,7 @@ import 'package:invoiceninja_flutter/redux/app/app_state.dart';
 import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart';
 import 'package:invoiceninja_flutter/redux/vendor/vendor_actions.dart';
 import 'package:invoiceninja_flutter/redux/vendor/vendor_selectors.dart';
-import 'package:invoiceninja_flutter/ui/app/presenters/vendor_presenter.dart';
+import 'file:///C:/Users/hillel/Documents/flutter-mobile/lib/ui/vendor/vendor_presenter.dart';
 import 'package:invoiceninja_flutter/ui/vendor/vendor_list.dart';
 import 'package:invoiceninja_flutter/utils/completers.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
diff --git a/lib/ui/app/presenters/vendor_presenter.dart b/lib/ui/vendor/vendor_presenter.dart
similarity index 100%
rename from lib/ui/app/presenters/vendor_presenter.dart
rename to lib/ui/vendor/vendor_presenter.dart
diff --git a/starter.sh b/starter.sh
index 48558f2bc..baaf0fa27 100644
--- a/starter.sh
+++ b/starter.sh
@@ -168,6 +168,7 @@ else
        './stubs/ui/stub/stub_list_item'
        './stubs/ui/stub/stub_list_vm'
        './stubs/ui/stub/stub_list'
+       './stubs/ui/stub/stub_presenter'
        './stubs/ui/stub/stub_screen')
 
     for i in "${files[@]}"
@@ -352,11 +353,6 @@ else
     code="${code}entityType: EntityType.${module_camel},${lineBreak}"
     code="${code}icon: getEntityIcon(EntityType.${module_camel}),${lineBreak}"
     code="${code}title: localization.${module_camel}s,${lineBreak}"
-    code="${code}onTap: () => store.dispatch(View${module_camel}List(context)),${lineBreak}"
-    code="${code}onCreateTap: () {${lineBreak}"
-    code="${code}navigator.pop();${lineBreak}"
-    code="${code}store.dispatch(Edit${Module}(${lineBreak}"
-    code="${code}${module_camel}: ${Module}Entity(), context: context));${lineBreak}"
     code="${code}},${lineBreak}"
     code="${code}),${lineBreak}"
     sed -i -e "s/$comment/$comment${lineBreak}$code/g" ./lib/ui/app/menu_drawer.dart
diff --git a/stubs/ui/stub/stub_list_vm b/stubs/ui/stub/stub_list_vm
index 527046229..2a7d3e745 100644
--- a/stubs/ui/stub/stub_list_vm
+++ b/stubs/ui/stub/stub_list_vm
@@ -35,6 +35,7 @@ class StubListBuilder extends StatelessWidget {
 
 class StubListVM {
   StubListVM({
+    @required this.state,
     @required this.userCompany,
     @required this.stubList,
     @required this.stubMap,
@@ -64,6 +65,7 @@ class StubListVM {
     final state = store.state;
 
     return StubListVM(
+        state: state,
         userCompany: state.userCompany,
         listState: state.stubListState,
         stubList: memoizedFilteredStubList(state.stubState.map,
@@ -93,6 +95,7 @@ class StubListVM {
     );
   }
 
+  final AppState state;
   final UserCompanyEntity userCompany;
   final List<String> stubList;
   final BuiltMap<String, StubEntity> stubMap;
diff --git a/stubs/ui/stub/stub_presenter b/stubs/ui/stub/stub_presenter
new file mode 100644
index 000000000..e25424b82
--- /dev/null
+++ b/stubs/ui/stub/stub_presenter
@@ -0,0 +1,25 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_redux/flutter_redux.dart';
+import 'package:invoiceninja_flutter/data/models/models.dart';
+import 'package:invoiceninja_flutter/data/models/stub_model.dart';
+import 'package:invoiceninja_flutter/redux/app/app_state.dart';
+import 'package:invoiceninja_flutter/ui/app/presenters/entity_presenter.dart';
+import 'package:invoiceninja_flutter/utils/formatting.dart';
+
+class StubPresenter extends EntityPresenter {
+  static List<String> getTableFields(UserCompanyEntity userCompany) {
+    return [
+    ];
+  }
+
+  @override
+  Widget getField({String field, BuildContext context}) {
+    final state = StoreProvider.of<AppState>(context).state;
+    final stub = entity as InvoiceEntity;
+
+    switch (field) {
+    }
+
+    return super.getField(field: field, context: context);
+  }
+}