diff --git a/lib/data/models/entities.dart b/lib/data/models/entities.dart
index d3078abf5..cdafe3008 100644
--- a/lib/data/models/entities.dart
+++ b/lib/data/models/entities.dart
@@ -263,6 +263,7 @@ class EntityFields {
   static const String assignedTo = 'assigned_to';
   static const String createdBy = 'created_by';
   static const String state = 'entity_state';
+  static const String isDeleted = 'is_deleted';
 }
 
 abstract class BaseEntity implements SelectableEntity {
diff --git a/lib/ui/app/presenters/entity_presenter.dart b/lib/ui/app/presenters/entity_presenter.dart
index 680c4c8ea..fe8c2cfdf 100644
--- a/lib/ui/app/presenters/entity_presenter.dart
+++ b/lib/ui/app/presenters/entity_presenter.dart
@@ -33,6 +33,7 @@ class EntityPresenter {
       EntityFields.assignedTo,
       EntityFields.createdBy,
       EntityFields.state,
+      EntityFields.isDeleted,
     ];
   }
 
@@ -47,13 +48,17 @@ class EntityPresenter {
             convertTimestampToDateString(entity.createdAt), context,
             showTime: true));
       case EntityFields.updatedAt:
-        return Text(formatDate(
-            convertTimestampToDateString(entity.updatedAt), context,
-            showTime: true));
+        return Text(entity.updatedAt == 0
+            ? ''
+            : formatDate(
+                convertTimestampToDateString(entity.updatedAt), context,
+                showTime: true));
       case EntityFields.archivedAt:
-        return Text(formatDate(
-            convertTimestampToDateString(entity.archivedAt), context,
-            showTime: true));
+        return Text(entity.archivedAt == 0
+            ? ''
+            : formatDate(
+                convertTimestampToDateString(entity.archivedAt), context,
+                showTime: true));
       case EntityFields.state:
         return Text(entity.isActive
             ? localization.active
@@ -66,6 +71,8 @@ class EntityPresenter {
       case EntityFields.assignedTo:
         return Text(
             state.userState.map[entity.assignedUserId]?.listDisplayName ?? '');
+      case EntityFields.isDeleted:
+        return Text(entity.isDeleted ? localization.yes : localization.no);
     }
 
     return Text('Error: $field not found');
diff --git a/lib/ui/client/client_presenter.dart b/lib/ui/client/client_presenter.dart
index fb3e40406..ee4f7ad31 100644
--- a/lib/ui/client/client_presenter.dart
+++ b/lib/ui/client/client_presenter.dart
@@ -63,8 +63,10 @@ class ClientPresenter extends EntityPresenter {
       case ClientFields.idNumber:
         return Text(client.idNumber);
       case ClientFields.lastLoginAt:
-        return Text(formatDate(
-            convertTimestampToDateString(client.lastLogin), context));
+        return Text(client.lastLogin == 0
+            ? ''
+            : formatDate(
+                convertTimestampToDateString(client.lastLogin), context));
       case ClientFields.balance:
         return Align(
             alignment: Alignment.centerRight,
diff --git a/lib/ui/design/edit/design_edit.dart b/lib/ui/design/edit/design_edit.dart
index a03736862..ef74c0615 100644
--- a/lib/ui/design/edit/design_edit.dart
+++ b/lib/ui/design/edit/design_edit.dart
@@ -339,14 +339,13 @@ class DesignSection extends StatelessWidget {
           child: TextField(
             controller: textController,
             keyboardType: TextInputType.multiline,
+            minLines: 16,
+            maxLines: null,
             decoration: InputDecoration(
               border: InputBorder.none,
             ),
-            maxLines: null,
-            minLines: 16,
             style: TextStyle(
               fontFeatures: [FontFeature.tabularFigures()],
-              //fontSize: 30,
             ),
           ),
         ),
diff --git a/lib/ui/expense/expense_presenter.dart b/lib/ui/expense/expense_presenter.dart
index ce94ecd71..30555e0f3 100644
--- a/lib/ui/expense/expense_presenter.dart
+++ b/lib/ui/expense/expense_presenter.dart
@@ -48,9 +48,6 @@ class ExpensePresenter extends EntityPresenter {
       ExpenseFields.customValue2,
       ExpenseFields.customValue3,
       ExpenseFields.customValue4,
-      ExpenseFields.updatedAt,
-      ExpenseFields.archivedAt,
-      ExpenseFields.isDeleted,
       ExpenseFields.documents,
     ];
   }
@@ -135,14 +132,6 @@ class ExpensePresenter extends EntityPresenter {
         return Text(expense.customValue3);
       case ExpenseFields.customValue4:
         return Text(expense.customValue4);
-      case ExpenseFields.updatedAt:
-        return Text(formatDate(
-            convertTimestampToDateString(expense.updatedAt), context));
-      case ExpenseFields.archivedAt:
-        return Text(formatDate(
-            convertTimestampToDateString(expense.archivedAt), context));
-      case ExpenseFields.isDeleted:
-        return Text(expense.isDeleted.toString());
       case ExpenseFields.documents:
         return Text('${expense.documents.length}');
     }
diff --git a/lib/ui/project/project_presenter.dart b/lib/ui/project/project_presenter.dart
index 32ea96d8d..02c5e1a6a 100644
--- a/lib/ui/project/project_presenter.dart
+++ b/lib/ui/project/project_presenter.dart
@@ -29,9 +29,6 @@ class ProjectPresenter extends EntityPresenter {
       ProjectFields.customValue2,
       ProjectFields.customValue3,
       ProjectFields.customValue4,
-      ProjectFields.updatedAt,
-      ProjectFields.archivedAt,
-      ProjectFields.isDeleted,
       ProjectFields.documents,
     ];
   }
@@ -68,14 +65,6 @@ class ProjectPresenter extends EntityPresenter {
         return Text(project.customValue3);
       case ProjectFields.customValue4:
         return Text(project.customValue4);
-      case ProjectFields.updatedAt:
-        return Text(formatDate(
-            convertTimestampToDateString(project.updatedAt), context));
-      case ProjectFields.archivedAt:
-        return Text(formatDate(
-            convertTimestampToDateString(project.archivedAt), context));
-      case ProjectFields.isDeleted:
-        return Text(project.isDeleted.toString());
       case ProjectFields.documents:
         return Text('${project.documents.length}');
     }
diff --git a/lib/ui/task/task_presenter.dart b/lib/ui/task/task_presenter.dart
index 4fb2aeeef..4151b9498 100644
--- a/lib/ui/task/task_presenter.dart
+++ b/lib/ui/task/task_presenter.dart
@@ -37,9 +37,6 @@ class TaskPresenter extends EntityPresenter {
       TaskFields.customValue3,
       TaskFields.customValue4,
       TaskFields.documents,
-      TaskFields.updatedAt,
-      TaskFields.archivedAt,
-      TaskFields.isDeleted,
     ];
   }
 
@@ -96,14 +93,6 @@ class TaskPresenter extends EntityPresenter {
         return Text(task.customValue4);
       case TaskFields.documents:
         return Text('${task.documents.length}');
-      case TaskFields.updatedAt:
-        return Text(
-            formatDate(convertTimestampToDateString(task.updatedAt), context));
-      case TaskFields.archivedAt:
-        return Text(
-            formatDate(convertTimestampToDateString(task.archivedAt), context));
-      case TaskFields.isDeleted:
-        return Text(task.isDeleted.toString());
     }
 
     return super.getField(field: field, context: context);
diff --git a/lib/ui/vendor/vendor_presenter.dart b/lib/ui/vendor/vendor_presenter.dart
index b9fbc5c1e..9bc5e4007 100644
--- a/lib/ui/vendor/vendor_presenter.dart
+++ b/lib/ui/vendor/vendor_presenter.dart
@@ -35,7 +35,6 @@ class VendorPresenter extends EntityPresenter {
       VendorFields.customValue4,
       VendorFields.updatedAt,
       VendorFields.archivedAt,
-      VendorFields.isDeleted,
       VendorFields.documents,
     ];
   }
diff --git a/pubspec.lock b/pubspec.lock
index e2a281449..e0100f1e9 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1230,4 +1230,4 @@ packages:
     version: "2.2.1"
 sdks:
   dart: ">=2.12.0-0.0 <3.0.0"
-  flutter: ">=1.22.2"
+  flutter: ">=1.22.2 <2.0.0"