diff --git a/public/main.profile.dart.js b/public/main.profile.dart.js
index 34c6fd69526c..4cc9e05f8502 100644
--- a/public/main.profile.dart.js
+++ b/public/main.profile.dart.js
@@ -360012,10 +360012,12 @@
             t5 = "";
           C.JSArray_methods.addAll$1(t4, H.setRuntimeTypeInfo([T.Expanded$(new D.AppButton(_null, C.IconData_57648_MaterialIcons_null_false, t5, new V.DocumentGrid_build_closure(this), _null, _null), 1), new T.SizedBox(14, _null, _null, _null)], t2));
         }
-        t1 = J.$index$asx($.LocalizationsProvider__localizedValues.$index(0, t1.localeCode), "upload_file");
-        if (t1 == null)
-          t1 = "";
-        t4.push(T.Expanded$(new D.AppButton(_null, C.IconData_58178_MaterialIcons_null_false, t1, new V.DocumentGrid_build_closure0(this), _null, _null), 1));
+        if (!D.isMacOS() && !D.isLinux()) {
+          t1 = J.$index$asx($.LocalizationsProvider__localizedValues.$index(0, t1.localeCode), "upload_file");
+          if (t1 == null)
+            t1 = "";
+          t4.push(T.Expanded$(new D.AppButton(_null, C.IconData_58178_MaterialIcons_null_false, t1, new V.DocumentGrid_build_closure0(this), _null, _null), 1));
+        }
         t3.push(new T.Padding(C.EdgeInsets_16_0_16_16, T.Row$(t4, C.CrossAxisAlignment_2, C.MainAxisAlignment_0, C.MainAxisSize_1, _null), _null));
       } else
         t3.push(new T.Padding(new V.EdgeInsets(0, 30, 0, 30), T.Center$(L.Text$(t1.get$requiresAnEnterprisePlan(), _null, _null, _null, _null, _null, A.TextStyle$(_null, _null, C.MaterialColor_Map_HFpTk_4288585374, _null, _null, _null, _null, _null, _null, _null, _null, 18, _null, _null, _null, _null, true, _null, _null, _null, _null, _null, _null, _null), _null, _null, _null), _null, _null), _null));
@@ -369199,7 +369201,7 @@
   };
   Y._LoginState_build_closure16.prototype = {
     call$0: function() {
-      T.launch("https://status.invoiceninja.com", null, false);
+      T.launch("https://status.invoiceninja.com/", null, false);
     },
     $signature: 1
   };
@@ -384888,7 +384890,7 @@
       $.WidgetsBinding__instance.SchedulerBinding__postFrameCallbacks.push(new E._InvoiceEditItemsDesktopState__onFocusChange_closure());
     },
     build$1: function(_, context) {
-      var t4, company, invoice, t5, t6, client, t7, precision, lineItems, t8, includedLineItems, productState, productIds, hasTax1, hasTax2, hasTax3, customField1, customField2, customField3, customField4, lastIndex, tableFontColor, tableHeaderColor, t9, t10, t11, index, t12, t13, t14, t15, _this = this, _null = null,
+      var t4, company, invoice, t5, t6, client, t7, precision, lineItems, t8, includedLineItems, productState, productIds, hasTax1, hasTax2, hasTax3, customField1, customField2, customField3, customField4, tableFontColor, tableHeaderColor, lastIndex, t9, t10, t11, index, t12, t13, t14, t15, _this = this, _null = null,
         t1 = L.Localizations_of(context, C.Type_AppLocalization_KyD, type$.legacy_AppLocalization),
         viewModel = _this._widget.viewModel,
         state = viewModel.state,
@@ -384923,9 +384925,48 @@
       customField2 = t2 ? "task2" : "product2";
       customField3 = t2 ? "task3" : "product3";
       customField4 = t2 ? "task4" : "product4";
+      t2 = state.prefState.customColors._map$_map;
+      t3 = J.getInterceptor$asx(t2);
+      tableFontColor = t3.$index(t2, "invoice_header_font_color");
+      if (tableFontColor == null)
+        tableFontColor = "";
+      tableHeaderColor = t3.$index(t2, "invoice_header_background_color");
+      if (tableHeaderColor == null)
+        tableHeaderColor = "";
       if (_this._isReordering) {
-        t1 = type$.JSArray_legacy_Widget;
-        return Y.FormCard$(_null, H.setRuntimeTypeInfo([T.Row$(H.setRuntimeTypeInfo([B.IconButton$(C.Alignment_0_0, _null, _null, true, L.Icon$(C.IconData_57706_MaterialIcons_null_false, _null, _null), 24, new E._InvoiceEditItemsDesktopState_build_closure3(_this), C.EdgeInsets_8_8_8_8, _null, _null)], t1), C.CrossAxisAlignment_2, C.MainAxisAlignment_1, C.MainAxisSize_1, _null), new Z.ReorderableListView(new E._InvoiceEditItemsDesktopState_build_closure4(_this, lineItems, company, customField1, customField2, customField3, customField4, hasTax1, hasTax2, hasTax3, invoice, precision), J.get$length$asx(t7), new E._InvoiceEditItemsDesktopState_build_closure5(lineItems, viewModel), false, _null, false, true, _null)], t1), _null, 4, false, _null, false, C.EdgeInsets_12_0_12_0);
+        t2 = tableHeaderColor.length !== 0 ? new S.BoxDecoration(E.convertHexStringToColor(tableHeaderColor), _null, _null, _null, _null, _null, C.BoxShape_0) : new S.BoxDecoration(_null, _null, _null, _null, _null, _null, C.BoxShape_0);
+        t3 = type$.JSArray_legacy_Widget;
+        t4 = H.setRuntimeTypeInfo([T.Expanded$(new E.TableHeader(t1.get$item(t1), false, true, _null), 1), T.Expanded$(new E.TableHeader(t1.get$description(t1), false, false, _null), 2)], t3);
+        if (company.getCustomFieldLabel$1(customField1).length !== 0)
+          t4.push(T.Expanded$(new E.TableHeader(company.getCustomFieldLabel$1(customField1), false, false, _null), 1));
+        if (company.getCustomFieldLabel$1(customField2).length !== 0)
+          t4.push(T.Expanded$(new E.TableHeader(company.getCustomFieldLabel$1(customField2), false, false, _null), 1));
+        if (company.getCustomFieldLabel$1(customField3).length !== 0)
+          t4.push(T.Expanded$(new E.TableHeader(company.getCustomFieldLabel$1(customField3), false, false, _null), 1));
+        if (company.getCustomFieldLabel$1(customField4).length !== 0)
+          t4.push(T.Expanded$(new E.TableHeader(company.getCustomFieldLabel$1(customField4), false, false, _null), 1));
+        if (hasTax1) {
+          t5 = t1.get$tax();
+          t4.push(T.Expanded$(new E.TableHeader(t5 + (company.settings.enableInclusiveTaxes ? " - " + t1.get$inclusive() : ""), false, false, _null), 1));
+        }
+        if (hasTax2) {
+          t5 = t1.get$tax();
+          t4.push(T.Expanded$(new E.TableHeader(t5 + (company.settings.enableInclusiveTaxes ? " - " + t1.get$inclusive() : ""), false, false, _null), 1));
+        }
+        if (hasTax3) {
+          t5 = t1.get$tax();
+          t4.push(T.Expanded$(new E.TableHeader(t5 + (company.settings.enableInclusiveTaxes ? " - " + t1.get$inclusive() : ""), false, false, _null), 1));
+        }
+        t4.push(T.Expanded$(new E.TableHeader(_this._widget.isTasks ? t1.get$rate(t1) : t1.get$unitCost(), true, false, _null), 1));
+        if (company.enableProductQuantity || _this._widget.isTasks)
+          t4.push(T.Expanded$(new E.TableHeader(_this._widget.isTasks ? t1.get$hours() : t1.get$quantity(), true, false, _null), 1));
+        if (company.enableProductDiscount)
+          t4.push(T.Expanded$(new E.TableHeader(t1.get$discount(), true, false, _null), 1));
+        t4.push(T.Expanded$(new E.TableHeader(t1.get$lineTotal(), true, false, _null), 1));
+        t4.push(new T.SizedBox(16, _null, _null, _null));
+        t1 = tableFontColor.length !== 0 ? E.convertHexStringToColor(tableFontColor) : _null;
+        t4.push(B.IconButton$(C.Alignment_0_0, t1, _null, true, L.Icon$(C.IconData_57706_MaterialIcons_null_false, _null, _null), 24, new E._InvoiceEditItemsDesktopState_build_closure3(_this), C.EdgeInsets_8_8_8_8, _null, _null));
+        return Y.FormCard$(_null, H.setRuntimeTypeInfo([M.DecoratedBox$(T.Row$(t4, C.CrossAxisAlignment_2, C.MainAxisAlignment_0, C.MainAxisSize_1, _null), t2, C.DecorationPosition_0), new Z.ReorderableListView(new E._InvoiceEditItemsDesktopState_build_closure4(_this, lineItems, company, customField1, customField2, customField3, customField4, hasTax1, hasTax2, hasTax3, invoice, precision), J.get$length$asx(t7), new E._InvoiceEditItemsDesktopState_build_closure5(lineItems, viewModel), false, _null, false, true, _null)], t3), _null, 4, false, _null, false, C.EdgeInsets_12_0_12_0);
       }
       t2 = t5.where$1(t7, new E._InvoiceEditItemsDesktopState_build_closure6());
       if (!t2.get$iterator(t2).moveNext$0()) {
@@ -384952,61 +384993,41 @@
         ++lastIndex;
       if (company.getCustomFieldLabel$1(customField4).length !== 0)
         ++lastIndex;
-      t4 = state.prefState.customColors._map$_map;
-      t5 = J.getInterceptor$asx(t4);
-      tableFontColor = t5.$index(t4, "invoice_header_font_color");
-      if (tableFontColor == null)
-        tableFontColor = "";
-      tableHeaderColor = t5.$index(t4, "invoice_header_background_color");
-      if (tableHeaderColor == null)
-        tableHeaderColor = "";
-      t4 = t1.localeCode;
-      t5 = J.$index$asx($.LocalizationsProvider__localizedValues.$index(0, t4), "item");
-      if (t5 == null)
-        t5 = "";
-      t5 = H.setRuntimeTypeInfo([new E.TableHeader(t5, false, true, _null), new E.TableHeader(t1.get$description(t1), false, false, _null)], type$.JSArray_legacy_StatelessWidget);
+      t4 = H.setRuntimeTypeInfo([new E.TableHeader(t1.get$item(t1), false, true, _null), new E.TableHeader(t1.get$description(t1), false, false, _null)], type$.JSArray_legacy_StatelessWidget);
       if (company.getCustomFieldLabel$1(customField1).length !== 0)
-        t5.push(new E.TableHeader(company.getCustomFieldLabel$1(customField1), false, false, _null));
+        t4.push(new E.TableHeader(company.getCustomFieldLabel$1(customField1), false, false, _null));
       if (company.getCustomFieldLabel$1(customField2).length !== 0)
-        t5.push(new E.TableHeader(company.getCustomFieldLabel$1(customField2), false, false, _null));
+        t4.push(new E.TableHeader(company.getCustomFieldLabel$1(customField2), false, false, _null));
       if (company.getCustomFieldLabel$1(customField3).length !== 0)
-        t5.push(new E.TableHeader(company.getCustomFieldLabel$1(customField3), false, false, _null));
+        t4.push(new E.TableHeader(company.getCustomFieldLabel$1(customField3), false, false, _null));
       if (company.getCustomFieldLabel$1(customField4).length !== 0)
-        t5.push(new E.TableHeader(company.getCustomFieldLabel$1(customField4), false, false, _null));
+        t4.push(new E.TableHeader(company.getCustomFieldLabel$1(customField4), false, false, _null));
       if (hasTax1) {
-        t7 = t1.get$tax();
-        t5.push(new E.TableHeader(t7 + (company.settings.enableInclusiveTaxes ? " - " + t1.get$inclusive() : ""), false, false, _null));
+        t5 = t1.get$tax();
+        t4.push(new E.TableHeader(t5 + (company.settings.enableInclusiveTaxes ? " - " + t1.get$inclusive() : ""), false, false, _null));
       }
       if (hasTax2) {
-        t7 = t1.get$tax();
-        t5.push(new E.TableHeader(t7 + (company.settings.enableInclusiveTaxes ? " - " + t1.get$inclusive() : ""), false, false, _null));
+        t5 = t1.get$tax();
+        t4.push(new E.TableHeader(t5 + (company.settings.enableInclusiveTaxes ? " - " + t1.get$inclusive() : ""), false, false, _null));
       }
       if (hasTax3) {
-        t7 = t1.get$tax();
-        t5.push(new E.TableHeader(t7 + (company.settings.enableInclusiveTaxes ? " - " + t1.get$inclusive() : ""), false, false, _null));
-      }
-      t5.push(new E.TableHeader(_this._widget.isTasks ? t1.get$rate(t1) : t1.get$unitCost(), true, false, _null));
-      if (!t2 || _this._widget.isTasks) {
-        if (_this._widget.isTasks) {
-          t7 = J.$index$asx($.LocalizationsProvider__localizedValues.$index(0, t4), "hours");
-          if (t7 == null)
-            t7 = "";
-        } else
-          t7 = t1.get$quantity();
-        t5.push(new E.TableHeader(t7, true, false, _null));
+        t5 = t1.get$tax();
+        t4.push(new E.TableHeader(t5 + (company.settings.enableInclusiveTaxes ? " - " + t1.get$inclusive() : ""), false, false, _null));
       }
+      t4.push(new E.TableHeader(_this._widget.isTasks ? t1.get$rate(t1) : t1.get$unitCost(), true, false, _null));
+      if (!t2 || _this._widget.isTasks)
+        t4.push(new E.TableHeader(_this._widget.isTasks ? t1.get$hours() : t1.get$quantity(), true, false, _null));
       if (t3)
-        t5.push(new E.TableHeader(t1.get$discount(), true, false, _null));
-      t4 = J.$index$asx($.LocalizationsProvider__localizedValues.$index(0, t4), "line_total");
-      t5.push(new E.TableHeader(t4 == null ? "" : t4, true, false, _null));
-      t4 = L.Icon$(_this._isReordering ? C.IconData_57706_MaterialIcons_null_false : C.IconData_58919_MaterialIcons_null_false, _null, _null);
+        t4.push(new E.TableHeader(t1.get$discount(), true, false, _null));
+      t4.push(new E.TableHeader(t1.get$lineTotal(), true, false, _null));
+      t5 = L.Icon$(C.IconData_58919_MaterialIcons_null_false, _null, _null);
       t7 = tableFontColor.length !== 0 ? E.convertHexStringToColor(tableFontColor) : _null;
       t8 = new H.WhereIterable(includedLineItems, new E._InvoiceEditItemsDesktopState_build_closure7(), H._arrayInstanceType(includedLineItems)._eval$1("WhereIterable<1>"));
-      t5.push(B.IconButton$(C.Alignment_0_0, t7, _null, true, t4, 24, t8.get$length(t8) < 2 ? _null : new E._InvoiceEditItemsDesktopState_build_closure8(_this), C.EdgeInsets_8_8_8_8, _null, _null));
-      t4 = P.LinkedHashMap_LinkedHashMap$_literal([0, new S.FlexColumnWidth(1.3), 1, new S.FlexColumnWidth(2.2), lastIndex, new S.FixedColumnWidth(40)], type$.legacy_int, type$.legacy_TableColumnWidth);
+      t4.push(B.IconButton$(C.Alignment_0_0, t7, _null, true, t5, 24, t8.get$length(t8) < 2 ? _null : new E._InvoiceEditItemsDesktopState_build_closure8(_this), C.EdgeInsets_8_8_8_8, _null, _null));
+      t5 = P.LinkedHashMap_LinkedHashMap$_literal([0, new S.FlexColumnWidth(1.3), 1, new S.FlexColumnWidth(2.2), lastIndex, new S.FixedColumnWidth(40)], type$.legacy_int, type$.legacy_TableColumnWidth);
       t7 = "__datatable_" + H.S(_this._invoice_edit_items_desktop$_updatedAt) + "__";
       t9 = type$.ValueKey_legacy_String;
-      t5 = H.setRuntimeTypeInfo([new S.TableRow(_null, tableHeaderColor.length !== 0 ? new S.BoxDecoration(E.convertHexStringToColor(tableHeaderColor), _null, _null, _null, _null, _null, C.BoxShape_0) : _null, t5)], type$.JSArray_legacy_TableRow);
+      t4 = H.setRuntimeTypeInfo([new S.TableRow(_null, tableHeaderColor.length !== 0 ? new S.BoxDecoration(E.convertHexStringToColor(tableHeaderColor), _null, _null, _null, _null, _null, C.BoxShape_0) : new S.BoxDecoration(_null, _null, _null, _null, _null, _null, C.BoxShape_0), t4)], type$.JSArray_legacy_TableRow);
       for (t8 = type$.PopupMenuButton_legacy_String, t10 = type$.legacy_String, t11 = type$.JSArray_legacy_Widget, index = 0; index < J.get$length$asx(lineItems._copy_on_write_list$_list); ++index) {
         if (!(J.$index$asx(lineItems._copy_on_write_list$_list, index).typeId === "2" && _this._widget.isTasks))
           t12 = J.$index$asx(lineItems._copy_on_write_list$_list, index).typeId !== "2" && !_this._widget.isTasks || J.get$isEmpty$asx(J.$index$asx(lineItems._copy_on_write_list$_list, index));
@@ -385054,10 +385075,10 @@
           t13 = "__total_" + index + "_" + H.S(J.total$2$x(J.$index$asx(lineItems._copy_on_write_list$_list, index), invoice, precision)) + "_" + t6 + "__";
           t14.push(new T.Padding(C.EdgeInsets_0_0_16_0, E.TextFormField$(true, _null, false, _null, _null, C.InputDecoration_so3, false, false, _null, Y.formatNumber(J.total$2$x(J.$index$asx(lineItems._copy_on_write_list$_list, index), invoice, precision), context, t6, _null, C.FormatNumberType_0, true, _null, false), _null, new D.ValueKey(t13, t9), _null, 1, _null, false, _null, _null, _null, _null, true, _null, C.TextAlign_1, _null, _null), _null));
           t14.push(new Z.PopupMenuButton(new E._InvoiceEditItemsDesktopState_build_closure37(includedLineItems, lineItems, index, t1), _null, new E._InvoiceEditItemsDesktopState_build_closure38(_this, t1, viewModel, index, lineItems), _null, C.EdgeInsets_8_8_8_8, _null, new L.Icon(C.IconData_58372_MaterialIcons_null_false, _null, _null, _null), !J.get$isEmpty$asx(J.$index$asx(lineItems._copy_on_write_list$_list, index)), _null, _null, t8));
-          t5.push(new S.TableRow(new D.ValueKey(t12, t9), _null, t14));
+          t4.push(new S.TableRow(new D.ValueKey(t12, t9), _null, t14));
         }
       }
-      return Y.FormCard$(S.Table$(t5, t4, C.FlexColumnWidth_1, C.TableCellVerticalAlignment_2, new D.ValueKey(t7, t9)), _null, _null, 4, false, _null, false, C.EdgeInsets_12_0_12_0);
+      return Y.FormCard$(S.Table$(t4, t5, C.FlexColumnWidth_1, C.TableCellVerticalAlignment_2, new D.ValueKey(t7, t9)), _null, _null, 4, false, _null, false, C.EdgeInsets_12_0_12_0);
     }
   };
   E._InvoiceEditItemsDesktopState__updateTable_closure.prototype = {
@@ -396923,8 +396944,12 @@
         t13.push(new T.SizedBox(28, 28, U.CircularProgressIndicator$(_null, _null, _null, _null, _null, 4, _null, _null), _null));
       t13 = T.Row$(t13, C.CrossAxisAlignment_2, C.MainAxisAlignment_0, C.MainAxisSize_0, _null);
       t15 = H.setRuntimeTypeInfo([], t12);
-      if (D.getLayout(context) === C.AppLayout_desktop)
-        C.JSArray_methods.addAll$1(t15, H.setRuntimeTypeInfo([new T.Builder(new A.ReportsScreen_build_closure13(_this, t1, reportResult), _null), new X.AppTextButton(t1.get$$export(), new A.ReportsScreen_build_closure14(_this, context), true, _null, _null)], t12));
+      if (D.getLayout(context) === C.AppLayout_desktop) {
+        t16 = H.setRuntimeTypeInfo([new T.Builder(new A.ReportsScreen_build_closure13(_this, t1, reportResult), _null)], t12);
+        if (!(D.isMacOS() || D.isWindows() || D.isLinux()))
+          t16.push(new X.AppTextButton(t1.get$$export(), new A.ReportsScreen_build_closure14(_this, context), true, _null, _null));
+        C.JSArray_methods.addAll$1(t15, t16);
+      }
       if (D.getLayout(context) === C.AppLayout_mobile || !state.prefState.isHistoryVisible)
         t15.push(new T.Builder(new A.ReportsScreen_build_closure15(t1, state, store), _null));
       t13 = E.AppBar$(t15, _null, false, _null, _null, _null, 1, _null, false, _null, false, _null, _null, _null, leading, _null, true, _null, _null, _null, _null, t13, _null, _null, _null, 1, _null);
@@ -419921,6 +419946,14 @@
       var t1 = J.$index$asx($.LocalizationsProvider__localizedValues.$index(0, this.localeCode), "please_enter_a_value");
       return t1 == null ? "" : t1;
     },
+    get$item: function(_) {
+      var t1 = J.$index$asx($.LocalizationsProvider__localizedValues.$index(0, this.localeCode), "item");
+      return t1 == null ? "" : t1;
+    },
+    get$lineTotal: function() {
+      var t1 = J.$index$asx($.LocalizationsProvider__localizedValues.$index(0, this.localeCode), "line_total");
+      return t1 == null ? "" : t1;
+    },
     get$contactUs: function() {
       var t1 = J.$index$asx($.LocalizationsProvider__localizedValues.$index(0, this.localeCode), "contact_us");
       return t1 == null ? "" : t1;
@@ -420177,6 +420210,10 @@
       var t1 = J.$index$asx($.LocalizationsProvider__localizedValues.$index(0, this.localeCode), "apply_payment");
       return t1 == null ? "" : t1;
     },
+    get$hours: function() {
+      var t1 = J.$index$asx($.LocalizationsProvider__localizedValues.$index(0, this.localeCode), "hours");
+      return t1 == null ? "" : t1;
+    },
     get$gateway: function() {
       var t1 = J.$index$asx($.LocalizationsProvider__localizedValues.$index(0, this.localeCode), "gateway");
       return t1 == null ? "" : t1;