diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index e3773d4..f56da16 100644
--- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -73,6 +73,12 @@
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <CommandLineArguments>
+         <CommandLineArgument
+            argument = "--vm-service-host=0.0.0.0"
+            isEnabled = "YES">
+         </CommandLineArgument>
+      </CommandLineArguments>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Profile"
diff --git a/lib/BlindMasterScreens/day_time_picker.dart b/lib/BlindMasterScreens/day_time_picker.dart
index b2e4171..34fbfad 100644
--- a/lib/BlindMasterScreens/day_time_picker.dart
+++ b/lib/BlindMasterScreens/day_time_picker.dart
@@ -85,7 +85,7 @@ class _DayTimePickerState extends State<DayTimePicker> {
   Widget build(BuildContext context) {
     return AlertDialog(
       title: Text(
-        'New Schedule',
+        (widget.isEditing) ? 'Edit Schedule' : 'New Schedule',
         style: GoogleFonts.aBeeZee(),
       ),
       content: Column(
diff --git a/lib/BlindMasterScreens/individualControl/peripheral_screen.dart b/lib/BlindMasterScreens/individualControl/peripheral_screen.dart
index 9ccc8be..969f93c 100644
--- a/lib/BlindMasterScreens/individualControl/peripheral_screen.dart
+++ b/lib/BlindMasterScreens/individualControl/peripheral_screen.dart
@@ -168,6 +168,8 @@ class _PeripheralScreenState extends State<PeripheralScreen> {
                 calibrated = true;
                 calibrationStage = 0;
               });
+              // Fetch updated peripheral data after calibration completes
+              fetchState();
             }
           }
         });
@@ -198,6 +200,7 @@ class _PeripheralScreenState extends State<PeripheralScreen> {
       
       if (response == null) throw Exception("auth error");
       if (response.statusCode != 202) throw Exception("Server Error");
+      calibrated = false;
     } catch (e) {
       if (!mounted) return;
       ScaffoldMessenger.of(context).showSnackBar(errorSnackbar(e));
@@ -287,7 +290,7 @@ class _PeripheralScreenState extends State<PeripheralScreen> {
     }
   }
 
-  Future loop() async{
+  Future fetchState() async{
     try {
       final payload = {
         'periphId': widget.peripheralId
@@ -341,7 +344,7 @@ class _PeripheralScreenState extends State<PeripheralScreen> {
   Future initAll() async{
     getName();
     checkDeviceConnection();
-    loop();
+    fetchState();
   }
 
   void rename() {
@@ -734,9 +737,9 @@ class _PeripheralScreenState extends State<PeripheralScreen> {
             FloatingActionButton(
               heroTag: "recalibrate",
               tooltip: "Recalibrate Peripheral",
-              onPressed: deviceConnected ? recalibrate : null,
-              foregroundColor: deviceConnected ? Theme.of(context).highlightColor : Colors.grey.shade400,
-              backgroundColor: deviceConnected ? Theme.of(context).primaryColorDark : Colors.grey.shade300,
+              onPressed: (deviceConnected && calibrated) ? recalibrate : null,
+              foregroundColor: (deviceConnected && calibrated) ? Theme.of(context).highlightColor : Colors.grey.shade400,
+              backgroundColor: (deviceConnected && calibrated) ? Theme.of(context).primaryColorDark : Colors.grey.shade300,
               child: Icon(Icons.swap_vert),
             ),
           ],