diff --git a/lib/screens/add_meal.dart b/lib/screens/add_meal.dart
index c3bba1d..3789bd3 100644
--- a/lib/screens/add_meal.dart
+++ b/lib/screens/add_meal.dart
@@ -16,6 +16,14 @@ class AddMealScreen extends BasedScreen {
 class _AddMealScreen extends State<AddMealScreen> {
   final nameController = TextEditingController();
 
+  @override
+  void initState () {
+    super.initState();
+    setState(() {
+      nameController.text = "Meal ${widget.diary.meals.length}";
+    });
+  }
+
   @override
   void dispose() {
     nameController.dispose();
diff --git a/lib/widgets/diary.dart b/lib/widgets/diary.dart
index 608ddbc..fe12165 100644
--- a/lib/widgets/diary.dart
+++ b/lib/widgets/diary.dart
@@ -24,7 +24,7 @@ class DiaryWidget extends StatelessWidget {
             title: Row(
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               children: <Widget>[
-                Spacer(),
+                const Spacer(),
                 Text(
                   "${diary.calories.toStringAsFixed(1)} kcal",
                   style: Theme.of(context).textTheme.headlineLarge!.copyWith(