diff --git a/Frontend/lib/mih_components/mih_package_components/mih_numeric_stepper.dart b/Frontend/lib/mih_components/mih_package_components/mih_numeric_stepper.dart
index 43ba2f03..3afeaf06 100644
--- a/Frontend/lib/mih_components/mih_package_components/mih_numeric_stepper.dart
+++ b/Frontend/lib/mih_components/mih_package_components/mih_numeric_stepper.dart
@@ -115,7 +115,8 @@ class _MihNumericStepperState extends State<MihNumericStepper> {
                 ),
                 Visibility(
                   visible: _currentValue < (widget.minValue ?? 0) ||
-                      _currentValue > widget.maxValue!,
+                      (widget.maxValue != null &&
+                          _currentValue > widget.maxValue!),
                   child: const SizedBox(
                     height: 21,
                   ),
@@ -197,7 +198,8 @@ class _MihNumericStepperState extends State<MihNumericStepper> {
                 ),
                 Visibility(
                   visible: _currentValue < (widget.minValue ?? 0) ||
-                      _currentValue > widget.maxValue!,
+                      (widget.maxValue != null &&
+                          _currentValue > widget.maxValue!),
                   child: const SizedBox(
                     height: 21,
                   ),
diff --git a/Frontend/lib/mih_packages/calculator/package_tools/tip_calc.dart b/Frontend/lib/mih_packages/calculator/package_tools/tip_calc.dart
index 546fe21a..b4191d3f 100644
--- a/Frontend/lib/mih_packages/calculator/package_tools/tip_calc.dart
+++ b/Frontend/lib/mih_packages/calculator/package_tools/tip_calc.dart
@@ -232,6 +232,7 @@ class _TipCalcState extends State<TipCalc> {
   void initState() {
     super.initState();
     splitBillController.text = "No";
+    noPeopleController.text = "2";
     splitPosition = false;
     splitBillController.addListener(splitSelected);
   }
@@ -296,17 +297,29 @@ class _TipCalcState extends State<TipCalc> {
                   secondaryFillColor:
                       MzanziInnovationHub.of(context)!.theme.primaryColor(),
                   onChange: (value) {
-                    if (value) {
-                      setState(() {
-                        splitBillController.text = "Yes";
-                        splitPosition = value;
-                      });
-                    } else {
-                      setState(() {
-                        splitBillController.text = "No";
-                        splitPosition = value;
-                      });
-                    }
+                    setState(() {
+                      splitBillController.text = value ? "Yes" : "No";
+                      splitPosition = value;
+                      if (value) {
+                        noPeopleController.text =
+                            noPeopleController.text.isEmpty
+                                ? "2"
+                                : noPeopleController.text;
+                      } else {
+                        noPeopleController.clear();
+                      }
+                    });
+                    // if (value) {
+                    //   setState(() {
+                    //     splitBillController.text = "Yes";
+                    //     splitPosition = value;
+                    //   });
+                    // } else {
+                    //   setState(() {
+                    //     splitBillController.text = "No";
+                    //     splitPosition = value;
+                    //   });
+                    // }
                   },
                 ),
                 ValueListenableBuilder(