diff --git a/forms_pro/api/team.py b/forms_pro/api/team.py
index 58bfa09..bcc8f33 100644
--- a/forms_pro/api/team.py
+++ b/forms_pro/api/team.py
@@ -1,7 +1,7 @@
 import frappe
 
 from forms_pro.forms_pro.doctype.fp_team.fp_team import FPTeam, GetTeamMembersResponse
-from forms_pro.utils.teams import GetTeamFormsResponseSchema
+from forms_pro.utils.teams import GetTeamFormsResponseSchema, set_current_team
 from forms_pro.utils.teams import get_team_forms as get_team_forms_utils
 
 
@@ -35,9 +35,43 @@ def get_team_members(team_id: str) -> list[GetTeamMembersResponse]:
         user=frappe.session.user,
         throw=True,
     )
-    print("team_id", team_id)
 
     team: FPTeam = frappe.get_doc("FP Team", team_id)
     members = team.team_members
 
     return members
+
+
+@frappe.whitelist(methods=["POST"])
+def create_team(team_name: str) -> FPTeam:
+    """
+    Create a new team
+
+    Args:
+        team_name: Name of the team
+
+    Returns:
+        FPTeam - The created team
+    """
+
+    team: FPTeam = frappe.new_doc("FP Team")
+    team.team_name = team_name
+    team.insert()
+    return team
+
+
+@frappe.whitelist(methods=["POST"])
+def switch_team(team_id: str) -> None:
+    """
+    Switch to a new team
+    """
+
+    if not frappe.has_permission(
+        doctype="FP Team",
+        ptype="read",
+        doc=team_id,
+        user=frappe.session.user,
+    ):
+        raise frappe.PermissionError("You do not have permission to switch to this team")
+
+    set_current_team(team_id, frappe.session.user)
diff --git a/forms_pro/forms_pro/doctype/fp_team/fp_team.py b/forms_pro/forms_pro/doctype/fp_team/fp_team.py
index e717cb8..4ecc550 100644
--- a/forms_pro/forms_pro/doctype/fp_team/fp_team.py
+++ b/forms_pro/forms_pro/doctype/fp_team/fp_team.py
@@ -1,12 +1,13 @@
 # Copyright (c) 2025, harsh@buildwithhussain.com and contributors
 # For license information, please see license.txt
 
-# import frappe
+import frappe
 from frappe.model.document import Document
-from frappe.utils import cached_property
+from frappe.share import add_docshare
 from pydantic import BaseModel, EmailStr
 
 from forms_pro.api.user import get_user
+from forms_pro.utils.teams import set_current_team
 
 
 class GetTeamMembersResponse(BaseModel):
@@ -30,7 +31,7 @@ class FPTeam(Document):
         users: DF.TableMultiSelect[FPTeamMember]
     # end: auto-generated types
 
-    @cached_property
+    @property
     def team_members(self) -> list[GetTeamMembersResponse]:
         """
         Get the list of team members
@@ -60,4 +61,36 @@ def is_team_member(self, user: str) -> bool:
         Returns:
             bool - True if the user is a member of the team, False otherwise
         """
-        return user in self.team_members
+        return user in [member["email"] for member in self.team_members]
+
+    def after_insert(self) -> None:
+        self.add_to_team(self.owner)
+        set_current_team(self.name, self.owner)
+        self.save()
+
+    def add_to_team(self, user: str) -> None:
+        """
+        Add a user to the team
+
+        Args:
+            user: The user email address
+        """
+        if user == "Administrator":
+            return
+
+        if self.is_team_member(user):
+            frappe.throw(
+                frappe._("User is already a member of the team"),
+                frappe.DuplicateEntryError,
+            )
+
+        self.append("users", {"user": user})
+        add_docshare(
+            self.doctype,
+            self.name,
+            user,
+            read=1,
+            write=1,
+            share=1,
+            flags={"ignore_share_permission": True},
+        )
diff --git a/forms_pro/forms_pro/doctype/fp_team/test_fp_team.py b/forms_pro/forms_pro/doctype/fp_team/test_fp_team.py
index e353069..20caaad 100644
--- a/forms_pro/forms_pro/doctype/fp_team/test_fp_team.py
+++ b/forms_pro/forms_pro/doctype/fp_team/test_fp_team.py
@@ -1,9 +1,12 @@
 # Copyright (c) 2025, harsh@buildwithhussain.com and Contributors
 # See license.txt
 
-# import frappe
+import frappe
+from frappe.defaults import get_user_default
 from frappe.tests import IntegrationTestCase
 
+from forms_pro.tests import FORMS_PRO_TEST_USER
+
 # On IntegrationTestCase, the doctype test records and all
 # link-field test record dependencies are recursively loaded
 # Use these module variables to add/remove to/from that list
@@ -17,4 +20,58 @@ class IntegrationTestFPTeam(IntegrationTestCase):
     Use this class for testing interactions between multiple components.
     """
 
-    pass
+    def setUp(self):
+        super().setUp()
+        self.test_user = FORMS_PRO_TEST_USER
+
+    def tearDown(self):
+        frappe.set_user("Administrator")
+        super().tearDown()
+
+    def test_add_owner_to_team(self):
+        """
+        Test that after a user creates a team, that owner user is added to the team and the team is shared with the owner user
+        """
+
+        frappe.set_user(self.test_user)
+
+        team = frappe.new_doc("FP Team")
+        team.team_name = "Test Team"
+        team.insert()
+        team.reload()
+
+        frappe.set_user("Administrator")
+
+        # Check that the user is added to the team
+        self.assertTrue(team.is_team_member(self.test_user))
+
+        # Check that the user is added to the team
+        self.assertIsNotNone(
+            frappe.db.exists(
+                "FP Team Member",
+                {
+                    "parent": team.name,
+                    "parentfield": "users",
+                    "parenttype": "FP Team",
+                    "user": self.test_user,
+                },
+            )
+        )
+
+        # Check that the user is added to the team's docshare
+        self.assertTrue(
+            frappe.db.exists(
+                "DocShare",
+                {
+                    "share_doctype": "FP Team",
+                    "share_name": team.name,
+                    "user": self.test_user,
+                    "read": 1,
+                    "write": 1,
+                    "share": 1,
+                },
+            )
+        )
+
+        # Check that the user's current team is set to the team
+        self.assertEqual(get_user_default("current_team", self.test_user), team.name)
diff --git a/forms_pro/install.py b/forms_pro/install.py
index e719601..f408d42 100644
--- a/forms_pro/install.py
+++ b/forms_pro/install.py
@@ -2,6 +2,7 @@
 from frappe.core.doctype.user.user import User
 
 from forms_pro.roles import FORMS_PRO_ROLE
+from forms_pro.tests import FORMS_PRO_TEST_USER
 
 
 def after_install():
@@ -30,13 +31,11 @@ def give_admin_forms_pro_role():
 
 
 def create_test_user():
-    test_user = "test_forms_pro_user@example.com"
-
-    if frappe.db.exists("User", test_user):
+    if frappe.db.exists("User", FORMS_PRO_TEST_USER):
         return
 
     user: User = frappe.new_doc("User")
-    user.email = test_user
+    user.email = FORMS_PRO_TEST_USER
     user.first_name = "Test"
     user.last_name = "Forms Pro User"
     user.insert(ignore_permissions=True)
diff --git a/forms_pro/overrides/roles.py b/forms_pro/overrides/roles.py
index 8655789..fd73088 100644
--- a/forms_pro/overrides/roles.py
+++ b/forms_pro/overrides/roles.py
@@ -2,7 +2,7 @@
 from frappe.core.doctype.user.user import User
 
 from forms_pro.roles import FORMS_PRO_ROLE
-from forms_pro.utils.teams import get_user_teams, set_current_team
+from forms_pro.utils.teams import get_user_teams
 
 
 def has_forms_pro_permission() -> bool:
@@ -48,4 +48,3 @@ def create_default_team_for_user(user: User) -> None:
         },
     )
     team.save(ignore_permissions=True)
-    set_current_team(team.name, user.name)
diff --git a/forms_pro/public/images/logo_300.svg b/forms_pro/public/images/logo_300.svg
new file mode 100644
index 0000000..de2b2ed
--- /dev/null
+++ b/forms_pro/public/images/logo_300.svg
@@ -0,0 +1,5 @@
+<svg width="300" height="300" viewBox="0 0 300 300" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="300" height="300" fill="white"/>
+<path d="M192.672 229.811C189.477 229.811 186.717 228.795 184.394 226.762C182.215 224.583 181.126 221.751 181.126 218.265C181.126 214.925 182.215 212.238 184.394 210.205C186.717 208.027 189.477 206.937 192.672 206.937C195.577 206.937 198.191 208.027 200.514 210.205C202.838 212.238 204 214.925 204 218.265C204 221.751 202.838 224.583 200.514 226.762C198.191 228.795 195.577 229.811 192.672 229.811Z" fill="black"/>
+<path d="M98.2677 227.85C96.0892 227.85 95 227.052 95 225.454C95 224.147 95.944 223.276 97.832 222.84L102.843 221.969C105.892 221.388 107.853 220.589 108.724 219.572C109.741 218.556 110.249 216.522 110.249 213.473V85.378C110.249 82.3281 109.741 80.2948 108.724 79.2782C107.853 78.2616 105.892 77.4628 102.843 76.8819L97.832 76.0105C95.944 75.5748 95 74.7034 95 73.3963C95 71.7988 96.0892 71 98.2677 71H168.415C171.755 71 173.57 72.6702 173.861 76.0105L175.604 112.173C175.894 114.642 174.95 115.877 172.772 115.877C171.029 115.877 170.012 114.933 169.722 113.045L168.633 105.856C167.471 98.3036 165.437 92.4217 162.533 88.21C159.628 83.9983 156.36 81.021 152.73 79.2782C149.099 77.3902 145.613 76.4462 142.273 76.4462C135.883 76.4462 131.526 77.4628 129.202 79.4961C126.878 81.5293 125.717 84.6518 125.717 88.8635V140.276C125.717 142.309 126.733 143.326 128.766 143.326H136.391C142.781 143.326 146.703 139.913 148.155 133.087L150.551 122.194C150.987 120.306 152.076 119.362 153.819 119.362C155.562 119.362 156.433 120.597 156.433 123.066V172.081C156.433 174.55 155.562 175.785 153.819 175.785C152.076 175.785 150.987 174.841 150.551 172.953L148.155 162.278C147.138 157.195 145.686 153.855 143.798 152.257C142.055 150.66 139.514 149.861 136.173 149.861H128.766C126.733 149.861 125.717 150.878 125.717 152.911V212.383C125.717 215.433 126.152 217.612 127.024 218.919C128.04 220.081 130.074 220.879 133.123 221.315L143.362 222.84C144.96 223.13 145.759 223.929 145.759 225.236C145.759 226.979 144.669 227.85 142.491 227.85H98.2677Z" fill="black"/>
+</svg>
diff --git a/forms_pro/tests/__init__.py b/forms_pro/tests/__init__.py
new file mode 100644
index 0000000..1f90860
--- /dev/null
+++ b/forms_pro/tests/__init__.py
@@ -0,0 +1,2 @@
+# Test user email address
+FORMS_PRO_TEST_USER = "test_forms_pro_user@example.com"
diff --git a/frontend/src/components/team/CreateTeamDialog.vue b/frontend/src/components/team/CreateTeamDialog.vue
new file mode 100644
index 0000000..f02e8ea
--- /dev/null
+++ b/frontend/src/components/team/CreateTeamDialog.vue
@@ -0,0 +1,77 @@
+<script setup lang="ts">
+import { Dialog, ErrorMessage, FormControl } from "frappe-ui";
+import * as z from "zod";
+import { reactive, ref, watch } from "vue";
+import { useUser } from "@/stores/user";
+
+const user = useUser();
+
+const model = defineModel<boolean>({
+    type: Boolean,
+    required: true,
+});
+
+const formErrors = ref<string>("");
+
+const formSchema = z.object({
+    team_name: z
+        .string()
+        .min(2, "Team name must be at least 2 characters long")
+        .max(140, "Team name must be less than 140 characters long"),
+});
+
+type Form = z.infer<typeof formSchema>;
+
+const form = reactive<Form>({
+    team_name: "",
+});
+
+watch(
+    () => form,
+    (newVal) => {
+        const result = formSchema.safeParse(newVal);
+        if (!result.success) {
+            formErrors.value = result.error.issues.map((issue) => issue.message).join(", ");
+        } else {
+            formErrors.value = "";
+        }
+    },
+    { deep: true }
+);
+
+function createTeam() {
+    const result = formSchema.safeParse(form);
+    if (!result.success) {
+        formErrors.value = result.error.issues.map((issue) => issue.message).join(", ");
+        return;
+    }
+    formErrors.value = "";
+    user.createTeam(form.team_name);
+    model.value = false;
+}
+</script>
+<template>
+    <Dialog
+        v-model="model"
+        :options="{
+            title: 'Create New Team',
+            icon: 'users',
+        }"
+    >
+        <template #body-content>
+            <div class="flex flex-col gap-4">
+                <FormControl
+                    v-model="form.team_name"
+                    label="Team Name"
+                    variant="outline"
+                    type="text"
+                    required
+                />
+                <ErrorMessage :message="formErrors" />
+                <Button @click="createTeam" :disabled="formErrors !== ''" variant="subtle">
+                    Create Team
+                </Button>
+            </div>
+        </template>
+    </Dialog>
+</template>
diff --git a/frontend/src/components/ui/Avatar.vue b/frontend/src/components/ui/Avatar.vue
index 4160d04..700cb25 100644
--- a/frontend/src/components/ui/Avatar.vue
+++ b/frontend/src/components/ui/Avatar.vue
@@ -11,11 +11,13 @@ const props = withDefaults(
         variant?: "default" | "outline" | "filled";
         shape?: "circle" | "square";
         className?: string;
+        disabled?: boolean;
     }>(),
     {
         size: "md",
         variant: "default",
         shape: "circle",
+        disabled: false,
     }
 );
 
@@ -29,11 +31,16 @@ onMounted(async () => {
 </script>
 
 <template>
-    <Tooltip v-if="user?.full_name" :text="user?.full_name" placement="bottom">
+    <Tooltip
+        v-if="user?.full_name"
+        :disabled="disabled"
+        :text="user?.full_name"
+        placement="bottom"
+    >
         <FrappeAvatar
             :size="size"
             :shape="shape"
-            :image="user?.user_image"
+            :image="user?.user_image ?? undefined"
             :label="user?.full_name"
         />
     </Tooltip>
diff --git a/frontend/src/layouts/BaseLayout.vue b/frontend/src/layouts/BaseLayout.vue
index 3f1bf83..3b8a969 100644
--- a/frontend/src/layouts/BaseLayout.vue
+++ b/frontend/src/layouts/BaseLayout.vue
@@ -1,34 +1,70 @@
 <template>
     <div class="flex h-screen w-full">
-        <Sidebar
-            :header="{
-                title: sidebarHeader.title,
-                subtitle: sidebarHeader.subtitle,
-                menuItems: sidebarHeader.menuItems,
-            }"
-            :sections="sidebarSections"
-        >
-            <template #header-logo>
-                <div
-                    class="font-instrument font-bold bg-surface-white rounded border border-outline-gray-1 py-[2px]"
-                >
-                    F.
-                </div>
+        <CreateTeamDialog v-model="showCreateTeamDialog" />
+        <Sidebar :header="sidebarHeader" :sections="sidebarSections">
+            <template #footer-items="{ isCollapsed }">
+                <Popover placement="top-start">
+                    <template #target="{ togglePopover, isOpen }">
+                        <div
+                            @click="togglePopover"
+                            class="p-2 z-10 rounded-md flex gap-2 items-center hover:bg-surface-white cursor-pointer duration-200 ease-[cubic-bezier(0.4, 0, 0.2, 1)]"
+                            :class="{ 'bg-surface-white': isOpen, '!p-1': isCollapsed }"
+                        >
+                            <Avatar
+                                :disabled="true"
+                                v-if="session.user"
+                                :user-id="session.user"
+                                size="lg"
+                                shape="square"
+                            />
+                            <div v-if="!isCollapsed" class="flex items-center gap-2">
+                                <div class="flex flex-col gap-1">
+                                    <span class="text-base font-medium text-ink-gray-7">
+                                        {{ session.full_name }}
+                                    </span>
+                                    <span class="text-xs text-ink-gray-5">{{ session.user }}</span>
+                                </div>
+                                <ChevronsUpDown class="size-4 text-ink-gray-6" />
+                            </div>
+                        </div>
+                    </template>
+                    <template #body>
+                        <div
+                            class="flex flex-col gap-2 bg-surface-white shadow-2xl z-0 rounded-t-lg -mb-2 p-2 pb-4 w-full"
+                            :class="{ 'rounded-br-lg': isCollapsed }"
+                        >
+                            <Button
+                                variant="ghost"
+                                theme="red"
+                                @click="session.logout.submit"
+                                label="Log out"
+                                icon-left="log-out"
+                            />
+                        </div>
+                    </template>
+                </Popover>
             </template>
         </Sidebar>
-        <slot></slot>
+        <slot> </slot>
     </div>
 </template>
 <script setup lang="ts">
 import { session } from "@/data/session";
-import { computed } from "vue";
-import { Sidebar, type SidebarProps } from "frappe-ui";
-import { LayoutDashboard, LogOut } from "lucide-vue-next";
+import { computed, ref } from "vue";
+import { Popover, Sidebar, type SidebarProps } from "frappe-ui";
+import { ChevronsUpDown, LayoutDashboard, Plus } from "lucide-vue-next";
 import type { PropType } from "vue";
+import Avatar from "@/components/ui/Avatar.vue";
+import { useUser } from "@/stores/user";
+import CreateTeamDialog from "@/components/team/CreateTeamDialog.vue";
+
+const userStore = useUser();
 
 type SidebarSectionProps = NonNullable<SidebarProps["sections"]> extends (infer T)[] ? T : never;
 type SidebarHeaderProps = NonNullable<SidebarProps["header"]>;
 
+const showCreateTeamDialog = ref(false);
+
 const props = defineProps({
     sidebarHeader: {
         type: Object as PropType<SidebarHeaderProps | null>,
@@ -40,24 +76,38 @@ const props = defineProps({
     },
 });
 
-const defaultSidebarMenuItems = computed(() => [
-    {
-        label: "Log out",
-        icon: LogOut,
-        onClick: session.logout.submit,
-    },
-]);
-
 const sidebarHeader = computed(() => {
     if (props.sidebarHeader) {
         return props.sidebarHeader;
     }
 
+    const switchTeamItems =
+        userStore.userTeams
+            ?.filter((team) => team.name !== userStore.currentTeam?.name)
+            .map((team) => ({
+                label: `Switch to ${team.team_name}`,
+                onClick: () => {
+                    userStore.switchTeam(team);
+                },
+            })) ?? [];
+
+    const menuItems = [
+        ...switchTeamItems,
+        {
+            label: "Create New Team",
+            icon: Plus,
+            onClick: () => {
+                showCreateTeamDialog.value = true;
+            },
+        },
+    ];
+
     return {
-        title: "Forms Pro",
-        subtitle: session.full_name ?? undefined,
-        menuItems: defaultSidebarMenuItems.value,
-    };
+        title: userStore.currentTeam?.team_name || "",
+        subtitle: "Switch Teams",
+        logo: "/assets/forms_pro/images/logo_300.svg",
+        menuItems: menuItems,
+    } as SidebarHeaderProps;
 });
 
 const sidebarSections = computed((): SidebarSectionProps[] => {
diff --git a/frontend/src/stores/team.ts b/frontend/src/stores/team.ts
index 79dd1b9..0f45e7a 100644
--- a/frontend/src/stores/team.ts
+++ b/frontend/src/stores/team.ts
@@ -1,6 +1,6 @@
 import { defineStore } from "pinia";
 import { useUser } from "./user";
-import { computed } from "vue";
+import { computed, watch } from "vue";
 import { useCall } from "frappe-ui";
 
 export type TeamMember = {
@@ -31,6 +31,10 @@ export const useTeam = defineStore("team", () => {
     teamMembersResource.fetch();
   }
 
+  watch(currentTeam, () => {
+    teamMembersResource.fetch();
+  });
+
   return {
     currentTeam,
     teamMembers,
diff --git a/frontend/src/stores/user.ts b/frontend/src/stores/user.ts
index 0d0565c..99090b2 100644
--- a/frontend/src/stores/user.ts
+++ b/frontend/src/stores/user.ts
@@ -3,6 +3,7 @@ import setTheme from "@/utils/theme";
 import { createResource } from "frappe-ui";
 import { defineStore } from "pinia";
 import { computed, ref } from "vue";
+import { toast } from "vue-sonner";
 
 export type UserTeam = {
   name: string;
@@ -10,6 +11,11 @@ export type UserTeam = {
   is_current: boolean;
 };
 
+export type CreateTeamResponse = {
+  name: string;
+  team_name: string;
+};
+
 export const useUser = defineStore("user", () => {
   const user = computed(() => userResource.data);
   const userTeams = computed<UserTeam[]>(() => userTeamsResource.data);
@@ -21,15 +27,26 @@ export const useUser = defineStore("user", () => {
 
   const userTeamsResource = createResource({
     url: "forms_pro.api.user.get_user_teams",
+    onSuccess(data: UserTeam[]) {
+      const _currTeam = data.find((team) => team.is_current);
+      if (!_currTeam) {
+        if (data.length > 0) {
+          setCurrentTeam(data[0]);
+        }
+        return;
+      }
+      setCurrentTeam(_currTeam);
+    },
+    onError(error: Error) {
+      toast.error("Failed to fetch user teams", {
+        description: error.message,
+      });
+    },
   });
 
   async function initialize() {
     await userResource.fetch();
     await userTeamsResource.fetch();
-    const _currTeam = getCurrentTeamFromAllTeams();
-    if (_currTeam) {
-      setCurrentTeam(_currTeam);
-    }
   }
 
   function fetchUser() {
@@ -48,6 +65,48 @@ export const useUser = defineStore("user", () => {
     currentTeam.value = team;
   }
 
+  function switchTeam(team: UserTeam) {
+    createResource({
+      url: "forms_pro.api.team.switch_team",
+      method: "POST",
+      makeParams() {
+        return {
+          team_id: team.name,
+        };
+      },
+      onSuccess() {
+        userTeamsResource.reload();
+        toast.success("Team switched successfully");
+      },
+      onError(error: Error) {
+        toast.error("Failed to switch team", {
+          description: error.message,
+        });
+      },
+    }).submit();
+  }
+
+  function createTeam(teamName: string) {
+    createResource({
+      url: "forms_pro.api.team.create_team",
+      method: "POST",
+      makeParams() {
+        return {
+          team_name: teamName,
+        };
+      },
+      onSuccess(data: CreateTeamResponse) {
+        userTeamsResource.reload();
+        toast.success("Team created successfully");
+      },
+      onError(error: Error) {
+        toast.error("Failed to create team", {
+          description: error.message,
+        });
+      },
+    }).submit();
+  }
+
   async function toggleThemePreference(theme: ThemePreferenceType) {
     setTheme(theme);
 
@@ -70,6 +129,8 @@ export const useUser = defineStore("user", () => {
     fetchUser,
     fetchUserTeams,
     setCurrentTeam,
+    createTeam,
+    switchTeam,
     toggleThemePreference,
   };
 });