diff --git a/lib/constants.dart b/lib/constants.dart
index 89e988b92..36f2cc512 100644
--- a/lib/constants.dart
+++ b/lib/constants.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
 // This version must be updated in tandem with the pubspec version.
-const String kAppVersion = '2.0.10';
+const String kAppVersion = '2.0.1';
 const String kSiteUrl = 'https://invoiceninja.com';
 //const String kAppUrl = 'https://admin.invoiceninja.com';
 const String kAppUrl = 'https://staging.invoicing.co';
diff --git a/lib/data/models/design_model.dart b/lib/data/models/design_model.dart
index 54ee59b31..c68f61767 100644
--- a/lib/data/models/design_model.dart
+++ b/lib/data/models/design_model.dart
@@ -70,19 +70,21 @@ class DesignFields {
 abstract class DesignEntity extends Object
     with BaseEntity
     implements Built<DesignEntity, DesignEntityBuilder> {
-  factory DesignEntity({String id, AppState state}) {
+  factory DesignEntity(
+      {String id, AppState state, BuiltMap<String, String> design}) {
     return _$DesignEntity._(
       id: id ?? BaseEntity.nextId,
       isChanged: false,
       name: '',
-      design: BuiltMap<String, String>({
-        kDesignHeader: '',
-        kDesignBody: '',
-        kDesignFooter: '',
-        kDesignProducts: '',
-        kDesignTasks: '',
-        kDesignIncludes: '',
-      }),
+      design: design ??
+          BuiltMap<String, String>({
+            kDesignHeader: '',
+            kDesignBody: '',
+            kDesignFooter: '',
+            kDesignProducts: '',
+            kDesignTasks: '',
+            kDesignIncludes: '',
+          }),
       isCustom: true,
     );
   }
diff --git a/lib/ui/design/design_screen.dart b/lib/ui/design/design_screen.dart
index fd3f67608..6f8f1e886 100644
--- a/lib/ui/design/design_screen.dart
+++ b/lib/ui/design/design_screen.dart
@@ -127,8 +127,10 @@ class DesignScreen extends StatelessWidget {
               heroTag: 'design_fab',
               backgroundColor: Theme.of(context).primaryColorDark,
               onPressed: () {
-                createEntityByType(
-                    context: context, entityType: EntityType.design);
+                createEntity(
+                    context: context,
+                    entity: DesignEntity(
+                        design: state.designState.map[kDesignCleanId].design));
               },
               child: Icon(
                 Icons.add,