diff --git a/frontend2/src/components/JoinTeam.tsx b/frontend2/src/components/JoinTeam.tsx
new file mode 100644
index 000000000..843bd66e4
--- /dev/null
+++ b/frontend2/src/components/JoinTeam.tsx
@@ -0,0 +1,7 @@
+import React from "react";
+
+const JoinTeam: React.FC = () => {
+  return <div>you have no team! this page is tbd</div>;
+};
+
+export default JoinTeam;
diff --git a/frontend2/src/components/elements/DescriptiveCheckbox.tsx b/frontend2/src/components/elements/DescriptiveCheckbox.tsx
index d929b1b78..f9045f352 100644
--- a/frontend2/src/components/elements/DescriptiveCheckbox.tsx
+++ b/frontend2/src/components/elements/DescriptiveCheckbox.tsx
@@ -20,7 +20,7 @@ const DescriptiveCheckbox: React.FC<DescriptiveCheckboxProps> = ({
       checked={checked}
       onChange={onChange}
       className={`flex w-full
-      flex-row items-center justify-between rounded-lg px-6 py-4 shadow ring-2 ring-inset
+      flex-row items-center justify-between gap-3 rounded-lg px-6 py-4 shadow ring-2 ring-inset
        ring-cyan-600/20 transition-all ui-checked:bg-cyan-900/80 ui-checked:ring-0`}
     >
       <div className="flex flex-col gap-2 text-left">
diff --git a/frontend2/src/contexts/CurrentTeamContext.ts b/frontend2/src/contexts/CurrentTeamContext.ts
index 567f02b28..a8e9db873 100644
--- a/frontend2/src/contexts/CurrentTeamContext.ts
+++ b/frontend2/src/contexts/CurrentTeamContext.ts
@@ -2,6 +2,8 @@ import { createContext, useContext } from "react";
 import { type TeamPrivate } from "../utils/types";
 
 export enum TeamStateEnum {
+  // the current team state is still loading
+  LOADING = "loading",
   // the current user is not part of a team (or is not logged in)
   NO_TEAM = "no_team",
   // the current user is part of a team
diff --git a/frontend2/src/contexts/CurrentTeamProvider.tsx b/frontend2/src/contexts/CurrentTeamProvider.tsx
index d8f3172c1..f18a0b4be 100644
--- a/frontend2/src/contexts/CurrentTeamProvider.tsx
+++ b/frontend2/src/contexts/CurrentTeamProvider.tsx
@@ -8,11 +8,13 @@ import { retrieveTeam } from "../utils/api/team";
 export const CurrentTeamProvider: React.FC<{ children: React.ReactNode }> = ({
   children,
 }) => {
+  // invariant: team must be undefined when teamState is LOADING or NO_TEAM
+  // team must be defined when teamState is IN_TEAM
   const [teamData, setTeamData] = useState<{
     team?: TeamPrivate;
     teamState: TeamStateEnum;
   }>({
-    teamState: TeamStateEnum.NO_TEAM,
+    teamState: TeamStateEnum.LOADING,
   });
   const { authState } = useCurrentUser();
   const { episodeId } = useEpisodeId();
diff --git a/frontend2/src/views/MyTeam.tsx b/frontend2/src/views/MyTeam.tsx
index ff3829924..f7431cde9 100644
--- a/frontend2/src/views/MyTeam.tsx
+++ b/frontend2/src/views/MyTeam.tsx
@@ -1,17 +1,28 @@
-import React, { useState } from "react";
+import React, { useMemo, useState } from "react";
 import { PageTitle } from "../components/elements/BattlecodeStyle";
 import SectionCard from "../components/SectionCard";
 import Input from "../components/elements/Input";
 import TextArea from "../components/elements/TextArea";
-import { useCurrentTeam } from "../contexts/CurrentTeamContext";
+import { TeamStateEnum, useCurrentTeam } from "../contexts/CurrentTeamContext";
 import Button from "../components/elements/Button";
 import MemberList from "../components/team/MemberList";
 import DescriptiveCheckbox from "../components/elements/DescriptiveCheckbox";
+import JoinTeam from "../components/JoinTeam";
 
 const MyTeam: React.FC = () => {
   const { team, teamState } = useCurrentTeam();
   const [checked, setChecked] = useState<boolean>(false);
-  const [checked1, setChecked1] = useState<boolean>(false);
+  const membersList = useMemo(() => {
+    return (
+      <div className="flex flex-col gap-8">
+        {team !== undefined && <MemberList members={team?.members} />}
+        <Button className="self-start" label="Leave team" />
+      </div>
+    );
+  }, [team]);
+  if (teamState !== TeamStateEnum.IN_TEAM || team === undefined) {
+    return <JoinTeam />;
+  }
   return (
     <div className="p-10">
       <PageTitle>Team Settings</PageTitle>
@@ -22,17 +33,17 @@ const MyTeam: React.FC = () => {
               <div className="flex flex-col items-center gap-6 p-4">
                 <img
                   className="h-24 w-24 rounded-full bg-gray-400 md:h-48 md:w-48"
-                  src={team?.profile?.avatar_url}
+                  src={team.profile?.avatar_url}
                 />
                 <div className="text-center text-xl font-semibold">
-                  {team?.name}
+                  {team.name}
                 </div>
               </div>
               <div className="flex flex-1 flex-col gap-4">
                 <Input
                   disabled
                   label="Join key"
-                  value={team?.join_key ?? "Loading..."}
+                  value={team.join_key ?? "Loading..."}
                 />
                 <Input label="Team quote" />
                 <TextArea label="Team biography" />
@@ -44,6 +55,10 @@ const MyTeam: React.FC = () => {
               </div>
             </div>
           </SectionCard>
+          {/* The members list that displays when on a smaller screen */}
+          <SectionCard className="shrink xl:hidden" title="Members">
+            {membersList}
+          </SectionCard>
           <SectionCard title="Eligibility">
             <div className="flex flex-col gap-4 2xl:flex-row">
               <div className="2xl:w-60">
@@ -116,10 +131,10 @@ const MyTeam: React.FC = () => {
                   ranked scrimmage requests. Ranked scrimmages affect your ELO rating."
                 />
                 <DescriptiveCheckbox
-                  checked={checked1}
-                  onChange={(checked1) => {
-                    console.log("new value", checked1);
-                    setChecked1(checked1);
+                  checked={checked}
+                  onChange={(checked) => {
+                    console.log("new value", checked);
+                    setChecked(checked);
                   }}
                   title="Auto-accept unranked scrimmages"
                   description="When enabled, your team will automatically accept
@@ -129,8 +144,9 @@ const MyTeam: React.FC = () => {
             </div>
           </SectionCard>
         </div>
-        <SectionCard className="shrink xl:max-w-lg" title="Members">
-          {team !== undefined && <MemberList members={team?.members} />}
+        {/* The members list that displays to the right side when on a big screen. */}
+        <SectionCard className="hidden w-1/3 shrink xl:block" title="Members">
+          {membersList}
         </SectionCard>
       </div>
     </div>