diff --git a/lib/plans_page.dart b/lib/plans_page.dart
index fd5a4df..1273fb6 100644
--- a/lib/plans_page.dart
+++ b/lib/plans_page.dart
@@ -76,8 +76,7 @@ class _PlansPageState extends State<_PlansPage> {
                       )),
                 );
 
-              if (plans == null)
-                return const Center(child: CircularProgressIndicator());
+              if (plans == null) return Container();
 
               return PlanList(plans: plans);
             }),
diff --git a/lib/set_list.dart b/lib/set_list.dart
index c60817b..5a92936 100644
--- a/lib/set_list.dart
+++ b/lib/set_list.dart
@@ -69,10 +69,6 @@ class _SetList extends State<SetList> {
             pagingController: pagingController,
             gymSet: gymSet,
           ),
-          firstPageProgressIndicatorBuilder: (_) =>
-              const Center(child: CircularProgressIndicator()),
-          newPageProgressIndicatorBuilder: (_) =>
-              const Center(child: CircularProgressIndicator()),
         ),
       ),
       floatingActionButton: FloatingActionButton(
diff --git a/lib/settings_page.dart b/lib/settings_page.dart
index 180a76a..06fe184 100644
--- a/lib/settings_page.dart
+++ b/lib/settings_page.dart
@@ -53,8 +53,7 @@ class _SettingsPageState extends State<_SettingsPage> {
           final settings = snapshot.data;
           print('build: $settings');
 
-          if (settings == null)
-            return const Center(child: CircularProgressIndicator());
+          if (settings == null) return Container();
 
           final filteredItems = [
             {'title': 'Alarm', 'value': settings.alarm},
diff --git a/lib/start_plan.dart b/lib/start_plan.dart
index fa490ad..9c538da 100644
--- a/lib/start_plan.dart
+++ b/lib/start_plan.dart
@@ -112,8 +112,7 @@ class _StartPlanState extends State<StartPlan> {
           },
           icon: const Icon(Icons.edit)));
 
-    if (totals.isEmpty || counts.isEmpty)
-      return const CircularProgressIndicator();
+    if (totals.isEmpty || counts.isEmpty) return Container();
 
     return SafeArea(
         child: Scaffold(
@@ -156,11 +155,19 @@ class _StartPlanState extends State<StartPlan> {
               decoration: const InputDecoration(labelText: 'Reps'),
               controller: repsController,
               focusNode: repsNode,
+              onTap: () {
+                repsController.selection = TextSelection(
+                    baseOffset: 0, extentOffset: repsController.text.length);
+              },
             ),
             TextFormField(
               decoration: const InputDecoration(labelText: 'Weight'),
               controller: weightController,
               focusNode: weightNode,
+              onTap: () {
+                weightController.selection = TextSelection(
+                    baseOffset: 0, extentOffset: weightController.text.length);
+              },
             ),
           ],
         ),