diff --git a/lib/screens/add_entry.dart b/lib/screens/add_entry.dart
index 3e27591..16ef176 100644
--- a/lib/screens/add_entry.dart
+++ b/lib/screens/add_entry.dart
@@ -127,6 +127,15 @@ class _AddEntryScreen extends State<AddEntryScreen> {
                     ),
                 ],
               ),
+              TextFormField(
+                decoration: const InputDecoration(
+                  labelText: 'Product name',
+                ),
+                controller: productNameController,
+                onChanged: (_) => _getProducts(),
+                onFieldSubmitted: (_) => _addEntry(),
+                autofocus: true,
+              ),
               TextFormField(
                 decoration: const InputDecoration(
                   labelText: 'Grams',
@@ -139,15 +148,6 @@ class _AddEntryScreen extends State<AddEntryScreen> {
                 ],
                 controller: gramsController,
                 onFieldSubmitted: (_) => _addEntry(),
-                autofocus: true,
-              ),
-              TextFormField(
-                decoration: const InputDecoration(
-                  labelText: 'Product name',
-                ),
-                controller: productNameController,
-                onChanged: (_) => _getProducts(),
-                onFieldSubmitted: (_) => _addEntry(),
               ),
               TextButton(
                 onPressed: () {
diff --git a/lib/screens/edit_entry.dart b/lib/screens/edit_entry.dart
index 69faf95..3141b09 100644
--- a/lib/screens/edit_entry.dart
+++ b/lib/screens/edit_entry.dart
@@ -107,6 +107,14 @@ class _EditEntryScreen extends State<EditEntryScreen> {
             constraints: const BoxConstraints(maxWidth: 720),
             padding: const EdgeInsets.all(10),
             child: ListView(children: <Widget>[
+              TextFormField(
+                decoration: const InputDecoration(
+                  labelText: 'Product name',
+                ),
+                controller: productNameController,
+                onChanged: (_) => _getProducts(),
+                autofocus: true,
+              ),
               TextFormField(
                 decoration: const InputDecoration(
                   labelText: 'Grams',
@@ -119,13 +127,6 @@ class _EditEntryScreen extends State<EditEntryScreen> {
                 ],
                 controller: gramsController,
               ),
-              TextFormField(
-                decoration: const InputDecoration(
-                  labelText: 'Product name',
-                ),
-                controller: productNameController,
-                onChanged: (_) => _getProducts(),
-              ),
               TextButton(
                 onPressed: () {
                   Navigator.push(
diff --git a/pubspec.lock b/pubspec.lock
index 0c0749d..16d9df3 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -37,10 +37,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
+      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.1"
+    version: "1.17.2"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -99,14 +99,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.18.1"
-  js:
-    dependency: transitive
-    description:
-      name: js
-      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.6.7"
   lints:
     dependency: transitive
     description:
@@ -119,18 +111,18 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
+      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.15"
+    version: "0.12.16"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
+      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.0"
+    version: "0.5.0"
   meta:
     dependency: transitive
     description:
@@ -156,10 +148,10 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
+      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.10.0"
   stack_trace:
     dependency: transitive
     description:
@@ -196,10 +188,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
+      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.1"
+    version: "0.6.0"
   typed_data:
     dependency: transitive
     description:
@@ -216,5 +208,13 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
+  web:
+    dependency: transitive
+    description:
+      name: web
+      sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.4-beta"
 sdks:
-  dart: ">=3.0.6 <4.0.0"
+  dart: ">=3.1.0-185.0.dev <4.0.0"