diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index 42694e4..dfebb6c 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 android {
-    namespace = "com.example.archery_bookkeeper"
+    namespace = "com.novoyuuparosk.archery_bookkeeper"
     compileSdk = flutter.compileSdkVersion
     ndkVersion = flutter.ndkVersion
 
@@ -21,7 +21,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId = "com.example.archery_bookkeeper"
+        applicationId = "com.novoyuuparosk.archery_bookkeeper"
         // You can update the following values to match your application needs.
         // For more information, see: https://flutter.dev/to/review-gradle-config.
         minSdk = flutter.minSdkVersion
diff --git a/lib/presentation/widgets/scoring_grid/scoring_grid.dart b/lib/presentation/widgets/scoring_grid/scoring_grid.dart
index 63181bd..9c2eab5 100644
--- a/lib/presentation/widgets/scoring_grid/scoring_grid.dart
+++ b/lib/presentation/widgets/scoring_grid/scoring_grid.dart
@@ -91,12 +91,12 @@ class ScoringGrid extends StatelessWidget {
             ),
             child: Row(
               children: [
-                const SizedBox(width: 60, child: Center(child: Text('End\\Shot', style: TextStyle(fontWeight: FontWeight.bold, fontSize: 12)))),
+                const SizedBox(width: 50, child: Center(child: Text('End\\Shot', style: TextStyle(fontWeight: FontWeight.bold, fontSize: 12)))),
                 ...List.generate(arrowsPerEnd, (index) => 
-                  Expanded(child: Center(child: Text('#${index + 1}', style: const TextStyle(fontWeight: FontWeight.bold))))),
-                const SizedBox(width: 70, child: Center(child: Text('Sum of 3', style: TextStyle(fontWeight: FontWeight.bold, fontSize: 12)))),
+                  SizedBox(width: 55, child: Center(child: Text('#${index + 1}', style: const TextStyle(fontWeight: FontWeight.bold))))),
+                const SizedBox(width: 55, child: Center(child: Text('Sum of 3', style: TextStyle(fontWeight: FontWeight.bold, fontSize: 12)))),
                 SizedBox(
-                  width: 70, 
+                  width: 55, 
                   child: Center(
                     child: Text(
                       'Sum of 6', 
@@ -108,7 +108,7 @@ class ScoringGrid extends StatelessWidget {
                     ),
                   ),
                 ),
-                const SizedBox(width: 80, child: Center(child: Text('Accumulative', style: TextStyle(fontWeight: FontWeight.bold, fontSize: 12)))),
+                const SizedBox(width: 70, child: Center(child: Text('Accumulative', style: TextStyle(fontWeight: FontWeight.bold, fontSize: 12)))),
               ],
             ),
           ),
@@ -133,7 +133,7 @@ class ScoringGrid extends StatelessWidget {
                     children: [
                       // End number
                       Container(
-                        width: 60,
+                        width: 50,
                         padding: const EdgeInsets.symmetric(vertical: 8),
                         decoration: BoxDecoration(
                           color: Colors.grey.shade100,
@@ -151,7 +151,8 @@ class ScoringGrid extends StatelessWidget {
                       
                       // Arrow score cells
                       ...List.generate(arrowsPerEnd, (column) => 
-                        Expanded(
+                        SizedBox(
+                          width: 55,
                           child: ScoringCell(
                             score: scores[row][column],
                             isSelected: selectedRow == row && selectedColumn == column,
@@ -162,7 +163,7 @@ class ScoringGrid extends StatelessWidget {
                       
                       // Sum of 3 (end total)
                       Container(
-                        width: 70,
+                        width: 55,
                         padding: const EdgeInsets.symmetric(vertical: 8),
                         decoration: BoxDecoration(
                           color: Colors.blue.shade50,
@@ -180,7 +181,7 @@ class ScoringGrid extends StatelessWidget {
                       
                       // Sum of 6 (two-end total, only for even rows)
                       Container(
-                        width: 70,
+                        width: 55,
                         padding: const EdgeInsets.symmetric(vertical: 8),
                         decoration: BoxDecoration(
                           color: arrowsPerEnd == 3 
@@ -209,7 +210,7 @@ class ScoringGrid extends StatelessWidget {
                       
                       // Accumulative (running total)
                       Container(
-                        width: 80,
+                        width: 70,
                         padding: const EdgeInsets.symmetric(vertical: 8),
                         decoration: BoxDecoration(
                           color: Colors.green.shade50,
diff --git a/pubspec.lock b/pubspec.lock
index 22ed2f0..e62b1b1 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -18,13 +18,13 @@ packages:
     source: hosted
     version: "2.1.2"
   characters:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
       name: characters
-      sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
+      sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
+    version: "1.4.1"
   clock:
     dependency: transitive
     description:
@@ -116,21 +116,21 @@ packages:
     source: hosted
     version: "0.12.17"
   material_color_utilities:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
       name: material_color_utilities
-      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
+      sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b"
       url: "https://pub.dev"
     source: hosted
-    version: "0.11.1"
+    version: "0.13.0"
   meta:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
       name: meta
-      sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
+      sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
       url: "https://pub.dev"
     source: hosted
-    version: "1.16.0"
+    version: "1.17.0"
   path:
     dependency: transitive
     description:
@@ -185,13 +185,13 @@ packages:
     source: hosted
     version: "1.2.2"
   test_api:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
       name: test_api
-      sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00"
+      sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.6"
+    version: "0.7.7"
   vector_math:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 710de3f..578a918 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -46,6 +46,13 @@ dev_dependencies:
   # rules and activating additional ones.
   flutter_lints: ^6.0.0
 
+# Dependency overrides to force latest versions
+dependency_overrides:
+  characters: ^1.4.1
+  material_color_utilities: ^0.13.0
+  meta: ^1.17.0
+  test_api: ^0.7.7
+
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec