diff --git a/coordinator/coordinator.html b/coordinator/coordinator.html
index ec68eb5..e56c72e 100644
--- a/coordinator/coordinator.html
+++ b/coordinator/coordinator.html
@@ -95,10 +95,10 @@
             <button type="button" onclick="triggerService('/aescape/mode/activateReadyController')" class="btn btn-default">
                 Activate Ready Mode
             </button>
-            <button id="recordingStartButton" type="button" onclick="triggerService('/aescape/mode/activateTeachingController'); triggerService('/aescape/bags/startTeachRecording')" class="btn btn-primary">
+            <button id="recordingStartButton" type="button" onclick="triggerService('/aescape/hardware/calibrateRobotiq'); triggerService('/aescape/mode/activateTeachingController'); triggerService('/aescape/bags/startTeachRecording')" class="btn btn-primary">
                 Start Teach Recording
             </button>
-            <button id="recordingStopButton" type="button" onclick="triggerService('/aescape/bags/stopTeachRecording')" class="btn btn-primary">
+            <button id="recordingStopButton" type="button" onclick="triggerService('/aescape/bags/stopTeachRecording'); triggerService('/aescape/mode/activateReadyController')" class="btn btn-primary">
                 Stop Teach Recording
             </button>
         </div>
@@ -129,7 +129,7 @@
             <button id="executionStartButton" type="button" onclick="triggerService('/aescape/mode/activateExecutionController'); triggerService('/aescape/bags/startPlayingLastRecording')" class="btn btn-primary">
                 Play Last Recording
             </button>
-            <button id="executionStopButton" type="button" onclick="triggerService('/aescape/bags/stopPlayingBag')" class="btn btn-primary">
+            <button id="executionStopButton" type="button" onclick="triggerService('/aescape/bags/stopPlayingBag'); triggerService('/aescape/mode/activateReadyController')" class="btn btn-primary">
                 Stop Playing Recording
             </button>
             <div class="row">