diff --git a/client/src/components/game.ctrl.btns.top.jsx b/client/src/components/game.ctrl.btns.top.jsx
index 4ab0d543..2e54b54b 100644
--- a/client/src/components/game.ctrl.btns.top.jsx
+++ b/client/src/components/game.ctrl.btns.top.jsx
@@ -8,6 +8,7 @@ const addState = connect(
         const {
             ws,
             game,
+            animating,
         } = state;
 
         function sendAbandon() {
@@ -16,30 +17,31 @@ const addState = connect(
 
         return {
             game,
-
             sendAbandon,
+            animating,
         };
     },
+
     function receiveDispatch(dispatch) {
         function leave() {
             dispatch(actions.setNav('play'));
             dispatch(actions.setGame(null));
-            dispatch(actions.setInstance(null));
         }
 
         return { leave };
     }
+
 );
 
 function GameCtrlTopBtns(args) {
     const {
         game,
-
         leave,
         sendAbandon,
+        animating,
     } = args;
 
-    const finished = game && game.phase === 'Finished';
+    const finished = game && game.phase === 'Finish';
     const { abandonState } = this.state;
 
     const abandonStateTrue = e => {
@@ -52,7 +54,7 @@ function GameCtrlTopBtns(args) {
     const abandonText = abandonState ? 'Confirm' : 'Abandon';
     const abandonAction = abandonState ? sendAbandon : abandonStateTrue;
 
-    const abandonBtn = <button class={abandonClasses} disabled={finished} onClick={abandonAction}>{abandonText}</button>;
+    const abandonBtn = <button class={abandonClasses} disabled={finished || animating} onClick={abandonAction}>{abandonText}</button>;
     const leaveBtn = <button class='abandon confirming' onClick={leave}>Leave</button>;
 
     return (
diff --git a/client/src/components/instance.ctrl.top.btns.jsx b/client/src/components/instance.ctrl.top.btns.jsx
index 528e5d0e..3f01aea8 100644
--- a/client/src/components/instance.ctrl.top.btns.jsx
+++ b/client/src/components/instance.ctrl.top.btns.jsx
@@ -8,6 +8,7 @@ const addState = connect(
         const {
             ws,
             instance,
+            tutorial,
         } = state;
 
         function sendAbandon() {
@@ -21,10 +22,11 @@ const addState = connect(
         };
     },
     function receiveDispatch(dispatch) {
-        function leave() {
+        function leave(tutorial) {
             dispatch(actions.setNav('play'));
             dispatch(actions.setGame(null));
             dispatch(actions.setInstance(null));
+            if (tutorial && tutorial < 7) dispatch(actions.setTutorial(1));
         }
 
         return { leave };
@@ -37,6 +39,7 @@ function InstanceTopBtns(args) {
 
         leave,
         sendAbandon,
+        tutorial,
     } = args;
 
     const finished = instance && instance.phase === 'Finished';
@@ -53,7 +56,7 @@ function InstanceTopBtns(args) {
     const abandonAction = abandonState ? sendAbandon : abandonStateTrue;
 
     const abandonBtn = <button class={abandonClasses} disabled={finished} onClick={abandonAction}>{abandonText}</button>;
-    const leaveBtn = <button class='abandon confirming' onClick={leave}>Leave</button>;
+    const leaveBtn = <button class='abandon confirming' onClick={() => leave(tutorial)}>Leave</button>;
 
     return (
         <div class="instance-ctrl-btns">
diff --git a/client/src/components/vbox.component.jsx b/client/src/components/vbox.component.jsx
index ce9da0c3..1206f621 100644
--- a/client/src/components/vbox.component.jsx
+++ b/client/src/components/vbox.component.jsx
@@ -164,7 +164,7 @@ function Vbox(args) {
 
     function availableBtn(v, group, index) {
         if (!v) return <button disabled class='empty' >&nbsp;</button>;
-                const selected = vboxSelected[0] === group && vboxSelected[1] === index;
+        const selected = vboxSelected[0] === group && vboxSelected[1] === index;
 
         // state not yet set in double click handler
         function onDblClick(e) {
diff --git a/client/src/events.jsx b/client/src/events.jsx
index 6cc4cd5d..f088d4e7 100644
--- a/client/src/events.jsx
+++ b/client/src/events.jsx
@@ -210,7 +210,6 @@ function registerEvents(store) {
             }
 
             if (v.phase === 'Finished') {
-                setGame(null);
                 ws.sendAccountInstances();
             }
             if (v.time_control === 'Practice' && v.rounds.length === 1 && tutorial) {
diff --git a/client/src/tutorial.utils.jsx b/client/src/tutorial.utils.jsx
index a1fcc669..e425c2ac 100644
--- a/client/src/tutorial.utils.jsx
+++ b/client/src/tutorial.utils.jsx
@@ -78,7 +78,6 @@ function tutorialVbox(player, store, tutorial) {
             vbox.free[2] = [];
         }
     }
-    console.log(stage);
     store.dispatch(actions.setTutorial(stage));
 }