diff --git a/isolate_example/lib/infinite_process_page.dart b/isolate_example/lib/infinite_process_page.dart
index f948901df..a9a22b361 100644
--- a/isolate_example/lib/infinite_process_page.dart
+++ b/isolate_example/lib/infinite_process_page.dart
@@ -54,20 +54,24 @@ class InfiniteProcessPage extends StatelessWidget {
           Column(
             mainAxisSize: MainAxisSize.min,
             children: [
-              ButtonBar(
-                alignment: MainAxisAlignment.center,
-                children: [
-                  ElevatedButton(
-                    style: ElevatedButton.styleFrom(elevation: 8.0),
-                    onPressed: () => controller.start(),
-                    child: const Text('Start'),
-                  ),
-                  ElevatedButton(
-                    style: ElevatedButton.styleFrom(elevation: 8.0),
-                    onPressed: () => controller.terminate(),
-                    child: const Text('Terminate'),
-                  ),
-                ],
+              Padding(
+                padding: const EdgeInsets.all(8.0),
+                child: OverflowBar(
+                  spacing: 8.0,
+                  alignment: MainAxisAlignment.center,
+                  children: [
+                    ElevatedButton(
+                      style: ElevatedButton.styleFrom(elevation: 8.0),
+                      onPressed: () => controller.start(),
+                      child: const Text('Start'),
+                    ),
+                    ElevatedButton(
+                      style: ElevatedButton.styleFrom(elevation: 8.0),
+                      onPressed: () => controller.terminate(),
+                      child: const Text('Terminate'),
+                    ),
+                  ],
+                ),
               ),
               Row(
                 mainAxisAlignment: MainAxisAlignment.center,
diff --git a/place_tracker/lib/place_map.dart b/place_tracker/lib/place_map.dart
index 4219d0232..60f54864d 100644
--- a/place_tracker/lib/place_map.dart
+++ b/place_tracker/lib/place_map.dart
@@ -440,26 +440,30 @@ class _AddPlaceButtonBar extends StatelessWidget {
       child: Container(
         padding: const EdgeInsets.fromLTRB(0.0, 0.0, 0.0, 14.0),
         alignment: Alignment.bottomCenter,
-        child: ButtonBar(
-          alignment: MainAxisAlignment.center,
-          children: [
-            ElevatedButton(
-              style: ElevatedButton.styleFrom(foregroundColor: Colors.blue),
-              onPressed: onSavePressed,
-              child: const Text(
-                'Save',
-                style: TextStyle(color: Colors.white, fontSize: 16.0),
+        child: Padding(
+          padding: const EdgeInsets.all(8.0),
+          child: OverflowBar(
+            alignment: MainAxisAlignment.center,
+            spacing: 8.0,
+            children: [
+              ElevatedButton(
+                style: ElevatedButton.styleFrom(
+                  backgroundColor: Colors.blue,
+                  foregroundColor: Colors.white,
+                ),
+                onPressed: onSavePressed,
+                child: const Text('Save'),
               ),
-            ),
-            ElevatedButton(
-              style: ElevatedButton.styleFrom(foregroundColor: Colors.red),
-              onPressed: onCancelPressed,
-              child: const Text(
-                'Cancel',
-                style: TextStyle(color: Colors.white, fontSize: 16.0),
+              ElevatedButton(
+                style: ElevatedButton.styleFrom(
+                  backgroundColor: Colors.red,
+                  foregroundColor: Colors.white,
+                ),
+                onPressed: onCancelPressed,
+                child: const Text('Cancel'),
               ),
-            ),
-          ],
+            ],
+          ),
         ),
       ),
     );
@@ -484,46 +488,50 @@ class _CategoryButtonBar extends StatelessWidget {
       child: Container(
         padding: const EdgeInsets.fromLTRB(0.0, 0.0, 0.0, 14.0),
         alignment: Alignment.bottomCenter,
-        child: ButtonBar(
-          alignment: MainAxisAlignment.center,
-          children: [
-            FilledButton(
-              style: FilledButton.styleFrom(
-                  backgroundColor:
-                      selectedPlaceCategory == PlaceCategory.favorite
-                          ? Colors.green[700]
-                          : Colors.lightGreen),
-              child: const Text(
-                'Favorites',
-                style: TextStyle(color: Colors.white, fontSize: 14.0),
+        child: Padding(
+          padding: const EdgeInsets.all(8.0),
+          child: OverflowBar(
+            alignment: MainAxisAlignment.center,
+            spacing: 8.0,
+            children: <Widget>[
+              FilledButton(
+                style: FilledButton.styleFrom(
+                    backgroundColor:
+                        selectedPlaceCategory == PlaceCategory.favorite
+                            ? Colors.green[700]
+                            : Colors.lightGreen),
+                onPressed: () => onChanged(PlaceCategory.favorite),
+                child: const Text(
+                  'Favorites',
+                  style: TextStyle(color: Colors.white, fontSize: 14.0),
+                ),
               ),
-              onPressed: () => onChanged(PlaceCategory.favorite),
-            ),
-            FilledButton(
-              style: FilledButton.styleFrom(
-                  backgroundColor:
-                      selectedPlaceCategory == PlaceCategory.visited
-                          ? Colors.green[700]
-                          : Colors.lightGreen),
-              child: const Text(
-                'Visited',
-                style: TextStyle(color: Colors.white, fontSize: 14.0),
+              FilledButton(
+                style: FilledButton.styleFrom(
+                    backgroundColor:
+                        selectedPlaceCategory == PlaceCategory.visited
+                            ? Colors.green[700]
+                            : Colors.lightGreen),
+                onPressed: () => onChanged(PlaceCategory.visited),
+                child: const Text(
+                  'Visited',
+                  style: TextStyle(color: Colors.white, fontSize: 14.0),
+                ),
               ),
-              onPressed: () => onChanged(PlaceCategory.visited),
-            ),
-            FilledButton(
-              style: FilledButton.styleFrom(
-                  backgroundColor:
-                      selectedPlaceCategory == PlaceCategory.wantToGo
-                          ? Colors.green[700]
-                          : Colors.lightGreen),
-              child: const Text(
-                'Want To Go',
-                style: TextStyle(color: Colors.white, fontSize: 14.0),
+              FilledButton(
+                style: FilledButton.styleFrom(
+                    backgroundColor:
+                        selectedPlaceCategory == PlaceCategory.wantToGo
+                            ? Colors.green[700]
+                            : Colors.lightGreen),
+                onPressed: () => onChanged(PlaceCategory.wantToGo),
+                child: const Text(
+                  'Want To Go',
+                  style: TextStyle(color: Colors.white, fontSize: 14.0),
+                ),
               ),
-              onPressed: () => onChanged(PlaceCategory.wantToGo),
-            ),
-          ],
+            ],
+          ),
         ),
       ),
     );
diff --git a/tool/flutter_ci_script_master.sh b/tool/flutter_ci_script_master.sh
index 33379c994..1e8e898a8 100755
--- a/tool/flutter_ci_script_master.sh
+++ b/tool/flutter_ci_script_master.sh
@@ -38,8 +38,10 @@ declare -ar PROJECT_NAMES=(
     # TODO(DomesticMouse): Dart formatting required
     # "experimental/pedometer"
     # "experimental/pedometer/example"
-    "experimental/varfont_shader_puzzle"
-    "experimental/web_dashboard"
+    # TODO(DomesticMouse): Dart formatting required
+    # "experimental/varfont_shader_puzzle"
+    # TODO(DomesticMouse): Because every version of flutter_test from sdk depends on intl 0.18.1 and web_dashboard depends on intl ^0.17.0, flutter_test from sdk is forbidden.
+    # "experimental/web_dashboard"
     "flutter_maps_firestore"
     "form_app"
     "game_template"