diff --git a/client/assets/styles/game.css b/client/assets/styles/game.css
index 2b911195..def3b571 100644
--- a/client/assets/styles/game.css
+++ b/client/assets/styles/game.css
@@ -205,7 +205,6 @@
     position: absolute;
     top: 50%;
     left: 50%;
-    text-align: center;
 }
 
 CRYP DAMAGE
diff --git a/client/src/components/main.jsx b/client/src/components/main.jsx
index 593491a3..027b0e84 100644
--- a/client/src/components/main.jsx
+++ b/client/src/components/main.jsx
@@ -47,7 +47,7 @@ function Main(props) {
     if (nav === 'list') return <List />;
 
     return (
-        <Team />
+        <main></main>
     );
 }
 
diff --git a/client/src/components/nav.jsx b/client/src/components/nav.jsx
index 731176da..c8380893 100644
--- a/client/src/components/nav.jsx
+++ b/client/src/components/nav.jsx
@@ -16,6 +16,8 @@ const addState = connect(
         } = state;
 
         function sendInstanceState(instance) {
+            ws.clearGameStateTimeout();
+            ws.clearInstanceStateTimeout();
             return ws.sendInstanceState(instance.id);
         }
 
@@ -63,8 +65,14 @@ function Nav(args) {
         setTestInstance,
     } = args;
 
+    function joinInstance(i) {
+        navTo(null);
+        sendInstanceState(i);
+        return true;
+    }
+
     const joined = instances.map(i => (
-        <button key={i.id} onClick={() => sendInstanceState(i)} >{i.name}</button>
+        <button key={i.id} onClick={() => joinInstance(i)} >{i.name}</button>
     ));
 
     const teamElements = team.map((c, i) => {
diff --git a/client/src/events.jsx b/client/src/events.jsx
index 5d8e729c..72f79542 100644
--- a/client/src/events.jsx
+++ b/client/src/events.jsx
@@ -101,6 +101,7 @@ function registerEvents(store) {
 
     function setAccount(account) {
         store.dispatch(actions.setAccount(account));
+        store.dispatch(actions.setNav('team'));
     }
 
     function clearCombiner() {