diff --git a/lib/data/models/task_model.dart b/lib/data/models/task_model.dart
index 6074c6710..a6af29a6f 100644
--- a/lib/data/models/task_model.dart
+++ b/lib/data/models/task_model.dart
@@ -88,7 +88,6 @@ abstract class TaskTime implements Built<TaskTime, TaskTimeBuilder> {
   @memoized
   int get hashCode;
 
-  @nullable
   DateTime get startDate;
 
   @nullable
diff --git a/lib/ui/app/forms/date_picker.dart b/lib/ui/app/forms/date_picker.dart
index 6f6ea721c..498d45288 100644
--- a/lib/ui/app/forms/date_picker.dart
+++ b/lib/ui/app/forms/date_picker.dart
@@ -4,9 +4,9 @@ import 'package:invoiceninja_flutter/utils/strings.dart';
 
 class DatePicker extends StatefulWidget {
   const DatePicker({
-    @required this.labelText,
     @required this.onSelected,
     @required this.selectedDate,
+    this.labelText,
     this.validator,
     this.autoValidate = false,
     this.allowClearing = false,
diff --git a/lib/ui/task/edit/task_edit_desktop.dart b/lib/ui/task/edit/task_edit_desktop.dart
index 134a5465f..98926d1f2 100644
--- a/lib/ui/task/edit/task_edit_desktop.dart
+++ b/lib/ui/task/edit/task_edit_desktop.dart
@@ -233,6 +233,13 @@ class _TaskEditDesktopState extends State<TaskEditDesktop> {
         FormCard(
           //padding: const EdgeInsets.symmetric(horizontal: kMobileDialogPadding),
           child: Table(
+            columnWidths: {
+              0: FractionColumnWidth(.25),
+              1: FractionColumnWidth(.25),
+              2: FractionColumnWidth(.25),
+              3: FractionColumnWidth(.25),
+              4: FixedColumnWidth(kMinInteractiveDimension),
+            },
             children: [
               TableRow(
                 children: [
@@ -248,7 +255,6 @@ class _TaskEditDesktopState extends State<TaskEditDesktop> {
                   Padding(
                     padding: const EdgeInsets.only(right: kTableColumnGap),
                     child: DatePicker(
-                      labelText: localization.date,
                       selectedDate: taskTime.startDate == null
                           ? null
                           : convertDateTimeToSqlDate(taskTime.startDate),