diff --git a/.gitignore b/.gitignore
index f9f8fe7..597e91c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,4 +18,5 @@ yarn.lock
 /blob-report/
 /playwright/.cache/
 /scripts/
-/pb_data/
\ No newline at end of file
+/pb_data/
+/.tanstack/
\ No newline at end of file
diff --git a/src/app/routeTree.gen.ts b/src/app/routeTree.gen.ts
index ac4a6f7..2cf690e 100644
--- a/src/app/routeTree.gen.ts
+++ b/src/app/routeTree.gen.ts
@@ -23,6 +23,7 @@ import { Route as AuthedTournamentsTournamentIdRouteImport } from './routes/_aut
 import { Route as AuthedTeamsTeamIdRouteImport } from './routes/_authed/teams.$teamId'
 import { Route as AuthedProfilePlayerIdRouteImport } from './routes/_authed/profile.$playerId'
 import { Route as AuthedAdminPreviewRouteImport } from './routes/_authed/admin/preview'
+import { Route as AuthedAdminTournamentsIdRouteImport } from './routes/_authed/admin/tournaments/$id'
 import { ServerRoute as ApiTestServerRouteImport } from './routes/api/test'
 import { ServerRoute as ApiTournamentsUploadLogoServerRouteImport } from './routes/api/tournaments/upload-logo'
 import { ServerRoute as ApiEventsSplatServerRouteImport } from './routes/api/events.$'
@@ -91,6 +92,12 @@ const AuthedAdminPreviewRoute = AuthedAdminPreviewRouteImport.update({
   path: '/preview',
   getParentRoute: () => AuthedAdminRoute,
 } as any)
+const AuthedAdminTournamentsIdRoute =
+  AuthedAdminTournamentsIdRouteImport.update({
+    id: '/tournaments/$id',
+    path: '/tournaments/$id',
+    getParentRoute: () => AuthedAdminRoute,
+  } as any)
 const ApiTestServerRoute = ApiTestServerRouteImport.update({
   id: '/api/test',
   path: '/api/test',
@@ -131,6 +138,7 @@ export interface FileRoutesByFullPath {
   '/tournaments/$tournamentId': typeof AuthedTournamentsTournamentIdRoute
   '/admin/': typeof AuthedAdminIndexRoute
   '/tournaments': typeof AuthedTournamentsIndexRoute
+  '/admin/tournaments/$id': typeof AuthedAdminTournamentsIdRoute
 }
 export interface FileRoutesByTo {
   '/login': typeof LoginRoute
@@ -143,6 +151,7 @@ export interface FileRoutesByTo {
   '/tournaments/$tournamentId': typeof AuthedTournamentsTournamentIdRoute
   '/admin': typeof AuthedAdminIndexRoute
   '/tournaments': typeof AuthedTournamentsIndexRoute
+  '/admin/tournaments/$id': typeof AuthedAdminTournamentsIdRoute
 }
 export interface FileRoutesById {
   __root__: typeof rootRouteImport
@@ -158,6 +167,7 @@ export interface FileRoutesById {
   '/_authed/tournaments/$tournamentId': typeof AuthedTournamentsTournamentIdRoute
   '/_authed/admin/': typeof AuthedAdminIndexRoute
   '/_authed/tournaments/': typeof AuthedTournamentsIndexRoute
+  '/_authed/admin/tournaments/$id': typeof AuthedAdminTournamentsIdRoute
 }
 export interface FileRouteTypes {
   fileRoutesByFullPath: FileRoutesByFullPath
@@ -173,6 +183,7 @@ export interface FileRouteTypes {
     | '/tournaments/$tournamentId'
     | '/admin/'
     | '/tournaments'
+    | '/admin/tournaments/$id'
   fileRoutesByTo: FileRoutesByTo
   to:
     | '/login'
@@ -185,6 +196,7 @@ export interface FileRouteTypes {
     | '/tournaments/$tournamentId'
     | '/admin'
     | '/tournaments'
+    | '/admin/tournaments/$id'
   id:
     | '__root__'
     | '/_authed'
@@ -199,6 +211,7 @@ export interface FileRouteTypes {
     | '/_authed/tournaments/$tournamentId'
     | '/_authed/admin/'
     | '/_authed/tournaments/'
+    | '/_authed/admin/tournaments/$id'
   fileRoutesById: FileRoutesById
 }
 export interface RootRouteChildren {
@@ -346,6 +359,13 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof AuthedAdminPreviewRouteImport
       parentRoute: typeof AuthedAdminRoute
     }
+    '/_authed/admin/tournaments/$id': {
+      id: '/_authed/admin/tournaments/$id'
+      path: '/tournaments/$id'
+      fullPath: '/admin/tournaments/$id'
+      preLoaderRoute: typeof AuthedAdminTournamentsIdRouteImport
+      parentRoute: typeof AuthedAdminRoute
+    }
   }
 }
 declare module '@tanstack/react-start/server' {
@@ -391,11 +411,13 @@ declare module '@tanstack/react-start/server' {
 interface AuthedAdminRouteChildren {
   AuthedAdminPreviewRoute: typeof AuthedAdminPreviewRoute
   AuthedAdminIndexRoute: typeof AuthedAdminIndexRoute
+  AuthedAdminTournamentsIdRoute: typeof AuthedAdminTournamentsIdRoute
 }
 
 const AuthedAdminRouteChildren: AuthedAdminRouteChildren = {
   AuthedAdminPreviewRoute: AuthedAdminPreviewRoute,
   AuthedAdminIndexRoute: AuthedAdminIndexRoute,
+  AuthedAdminTournamentsIdRoute: AuthedAdminTournamentsIdRoute,
 }
 
 const AuthedAdminRouteWithChildren = AuthedAdminRoute._addFileChildren(
diff --git a/src/app/routes/__root.tsx b/src/app/routes/__root.tsx
index f6a9f0b..6fb35aa 100644
--- a/src/app/routes/__root.tsx
+++ b/src/app/routes/__root.tsx
@@ -13,7 +13,7 @@ import { DefaultCatchBoundary } from '@/components/DefaultCatchBoundary'
 import { type QueryClient } from '@tanstack/react-query'
 import { ensureSuperTokensFrontend } from '@/lib/supertokens/client'
 import { AuthContextType, authQueryConfig } from '@/contexts/auth-context'
-import Providers from '@/components/providers'
+import Providers from '@/features/core/components/providers'
 import { ColorSchemeScript, mantineHtmlProps } from '@mantine/core';
 import { HeaderConfig } from '@/features/core/types/header-config';
 
diff --git a/src/app/routes/_authed/admin/tournaments/$id.tsx b/src/app/routes/_authed/admin/tournaments/$id.tsx
new file mode 100644
index 0000000..3b360cb
--- /dev/null
+++ b/src/app/routes/_authed/admin/tournaments/$id.tsx
@@ -0,0 +1,33 @@
+import { createFileRoute } from '@tanstack/react-router'
+import { tournamentQueries } from '@/features/tournaments/queries'
+import { useQuery } from '@tanstack/react-query'
+import { useAuth } from '@/contexts/auth-context'
+import EditTournament from '@/features/admin/components/edit-tournament'
+import Page from '@/components/page'
+import { Loader } from '@mantine/core'
+
+export const Route = createFileRoute('/_authed/admin/tournaments/$id')({
+  beforeLoad: async ({ context, params }) => {
+    const { queryClient } = context;
+    await queryClient.ensureQueryData(tournamentQueries.details(params.id))
+  },
+  loader: () => ({
+    header: {
+      withBackButton: true,
+      title: 'Edit Tournament',
+    },
+  }),
+  component: RouteComponent,
+})
+
+function RouteComponent() {
+  const { id } = Route.useParams()
+  const { data: tournament } = useQuery(tournamentQueries.details(id))
+  if (!tournament) throw new Error("Tournament not found.")
+
+  return (
+    <Page>
+      <EditTournament tournament={tournament} />
+    </Page>
+  )
+}
\ No newline at end of file
diff --git a/src/app/routes/_authed/tournaments/$tournamentId.tsx b/src/app/routes/_authed/tournaments/$tournamentId.tsx
index 05cff52..e3c5b5a 100644
--- a/src/app/routes/_authed/tournaments/$tournamentId.tsx
+++ b/src/app/routes/_authed/tournaments/$tournamentId.tsx
@@ -2,11 +2,14 @@ import { createFileRoute } from '@tanstack/react-router'
 import { tournamentQueries } from '@/features/tournaments/queries';
 import Page from '@/components/page'
 import { useQuery } from '@tanstack/react-query';
-import { Box, Button } from '@mantine/core';
+import { Box, Group, Title } from '@mantine/core';
 import { useSheet } from '@/hooks/use-sheet';
 import Sheet from '@/components/sheet/sheet';
 import { Tournament } from '@/features/tournaments/types';
 import TeamList from '@/features/teams/components/team-list';
+import Button from '@/components/button';
+import Avatar from '@/components/avatar';
+import Profile from '@/features/tournaments/components/profile';
 
 export const Route = createFileRoute('/_authed/tournaments/$tournamentId')({
   beforeLoad: async ({ context, params }) => {
@@ -28,28 +31,8 @@ export const Route = createFileRoute('/_authed/tournaments/$tournamentId')({
 
 function RouteComponent() {
   const { data: tournament } = useQuery(tournamentQueries.details(Route.useParams().tournamentId));
-
-  const sheet = useSheet()
-
   return <Page noPadding>
-    <Box mt='xl' p='md'>
-
-      <h3 style={{ marginTop: 0 }}>
-        {tournament?.name}
-      </h3>
-
-      <Button onClick={() => sheet.open()}>
-        View Teams
-      </Button>
-
-    </Box>
-
-    <Sheet
-      {...sheet.props}
-      title='Teams'
-    >
-      <TeamDrawer tournament={tournament!} />
-    </Sheet>
+    <Profile tournament={tournament!} />
   </Page>
 }
 
diff --git a/src/app/routes/_authed/tournaments/index.tsx b/src/app/routes/_authed/tournaments/index.tsx
index c9db7c9..b5df4ed 100644
--- a/src/app/routes/_authed/tournaments/index.tsx
+++ b/src/app/routes/_authed/tournaments/index.tsx
@@ -1,5 +1,5 @@
 import Page from '@/components/page'
-import { Button, Stack } from '@mantine/core'
+import { Stack } from '@mantine/core'
 import { createFileRoute } from '@tanstack/react-router'
 import { TournamentCard } from '@/features/tournaments/components/tournament-card'
 import { tournamentQueries } from '@/features/tournaments/queries'
@@ -9,6 +9,7 @@ import { useSheet } from '@/hooks/use-sheet'
 import Sheet from '@/components/sheet/sheet'
 import CreateTournament from '@/features/admin/components/create-tournament'
 import { PlusIcon } from '@phosphor-icons/react'
+import Button from '@/components/button'
 
 export const Route = createFileRoute('/_authed/tournaments/')({
   beforeLoad: async ({ context }) => {
diff --git a/src/components/DefaultCatchBoundary.tsx b/src/components/DefaultCatchBoundary.tsx
index eb0892c..2b2bd82 100644
--- a/src/components/DefaultCatchBoundary.tsx
+++ b/src/components/DefaultCatchBoundary.tsx
@@ -4,11 +4,12 @@ import {
   useMatch,
   useRouter,
   useNavigate,
+  redirect,
 } from '@tanstack/react-router'
 import type { ErrorComponentProps } from '@tanstack/react-router'
 import { 
   Box, 
-  Button, 
+  Button as MantineButton,
   Text, 
   Title, 
   Stack, 
@@ -23,6 +24,7 @@ import { useEffect } from 'react'
 import toast from '@/lib/sonner'
 import { logger } from '@/lib/logger'
 import { ExclamationMarkIcon, XCircleIcon } from '@phosphor-icons/react'
+import Button from './button'
 
 export function DefaultCatchBoundary({ error }: ErrorComponentProps) {
   const router = useRouter()
@@ -41,8 +43,8 @@ export function DefaultCatchBoundary({ error }: ErrorComponentProps) {
 
     if (errorMessage.toLowerCase().includes('unauthenticated')) {
       toast.error('You\'ve been logged out')
-      navigate({ to: '/login' })
-      return
+      router.history.push('/login')
+      throw redirect({ to: '/login' })
     }
   }, [error, errorMessage, navigate])
 
@@ -73,13 +75,13 @@ export function DefaultCatchBoundary({ error }: ErrorComponentProps) {
             >
               Go Back
             </Button>
-            <Button
+            <MantineButton
               component={Link}
               to="/"
               variant="filled"
             >
               Home
-            </Button>
+            </MantineButton>
           </Group>
         </Stack>
       </Box>
@@ -137,13 +139,13 @@ export function DefaultCatchBoundary({ error }: ErrorComponentProps) {
             Try Again
           </Button>
           {isRoot ? (
-            <Button
+            <MantineButton
               component={Link}
               to="/"
               variant="filled"
             >
               Home
-            </Button>
+            </MantineButton>
           ) : (
             <Button
               variant="filled"
diff --git a/src/components/avatar.tsx b/src/components/avatar.tsx
index 5e4b40d..424ea5d 100644
--- a/src/components/avatar.tsx
+++ b/src/components/avatar.tsx
@@ -4,11 +4,14 @@ interface AvatarProps extends Omit<MantineAvatarProps, 'radius' | 'color' | 'siz
   name: string;
   size?: number;
   radius?: string | number;
+  withBorder?: boolean;
 }
 
-const Avatar = ({ name, size = 35, radius = '100%', ...props }: AvatarProps) => {
-  return <Paper p={size / 20} radius={radius} withBorder>
-    <MantineAvatar alt={name} key={name} name={name} color='initials' size={size} radius={radius} {...props} />
+const Avatar = ({ name, size = 35, radius = '100%', withBorder = true, ...props }: AvatarProps) => {
+  return <Paper p={size / 20} radius={radius} withBorder={withBorder}>
+    <MantineAvatar alt={name} key={name} name={name} color='initials' size={size} radius={radius} w='fit-content' styles={{ image: {
+      objectFit: 'contain'
+    } }} {...props} />
   </Paper>
 }
 
diff --git a/src/components/button.tsx b/src/components/button.tsx
new file mode 100644
index 0000000..66f8e63
--- /dev/null
+++ b/src/components/button.tsx
@@ -0,0 +1,11 @@
+import { Button as MantineButton, ButtonProps as MantineButtonProps } from '@mantine/core';
+import { forwardRef, ComponentPropsWithoutRef } from 'react';
+
+type ButtonProps = MantineButtonProps & ComponentPropsWithoutRef<'button'>;
+
+const Button = forwardRef<HTMLButtonElement, ButtonProps>((props, ref) => {
+  return <MantineButton fullWidth ref={ref} {...props} />;
+});
+
+Button.displayName = 'Button';
+export default Button;
diff --git a/src/components/date-input.tsx b/src/components/date-input.tsx
new file mode 100644
index 0000000..519a289
--- /dev/null
+++ b/src/components/date-input.tsx
@@ -0,0 +1,78 @@
+import { TextInput, Flex, Box, Button } from "@mantine/core";
+import { CalendarIcon } from "@phosphor-icons/react";
+import { useSheet } from "@/hooks/use-sheet";
+import Sheet from "@/components/sheet/sheet";
+import { DateTimePicker } from "../features/admin/components/date-time-picker";
+
+interface DateInputProps {
+  label: string;
+  value: string;
+  onChange: (value: string) => void;
+  withAsterisk?: boolean;
+  error?: React.ReactNode;
+  placeholder?: string;
+}
+
+// Date input that opens a sheet with mantine date time picker when clicked
+export const DateInputSheet = ({ 
+  label, 
+  value, 
+  onChange, 
+  withAsterisk, 
+  error,
+  placeholder 
+}: DateInputProps) => {
+  const sheet = useSheet();
+
+  const formatDisplayValue = (dateString: string) => {
+    if (!dateString) return '';
+    const date = new Date(dateString);
+    if (isNaN(date.getTime())) return '';
+    return date.toLocaleDateString('en-US', {
+      weekday: 'short',
+      year: 'numeric',
+      month: 'short',
+      day: 'numeric',
+      hour: 'numeric',
+      minute: 'numeric',
+      hour12: true
+    });
+  };
+
+  const handleDateChange = (newValue: string | null) => {
+    onChange(newValue || '');
+    sheet.close();
+  };
+
+  const dateValue = value ? new Date(value) : null;
+
+  return (
+    <>
+      <TextInput
+        label={label}
+        value={formatDisplayValue(value)}
+        onClick={sheet.open}
+        readOnly
+        withAsterisk={withAsterisk}
+        error={error}
+        placeholder={placeholder || "Click to select date"}
+        rightSection={<CalendarIcon size={16} />}
+        style={{ cursor: 'pointer' }}
+      />
+      
+      <Sheet {...sheet.props} title={`Select ${label}`}>
+        <Flex gap='xs' direction='column' justify='center' p="md">
+          <Box mx='auto'>
+            <DateTimePicker
+              value={dateValue}
+              onChange={handleDateChange}
+            />
+          </Box>
+          <Button onClick={sheet.close} variant="subtle">
+            Close
+          </Button>
+        </Flex>
+      </Sheet>
+    </>
+  );
+};
\ No newline at end of file
diff --git a/src/components/sheet/slide-panel/slide-panel.tsx b/src/components/sheet/slide-panel/slide-panel.tsx
index 46212d3..69c64f1 100644
--- a/src/components/sheet/slide-panel/slide-panel.tsx
+++ b/src/components/sheet/slide-panel/slide-panel.tsx
@@ -1,7 +1,8 @@
-import { Box, Text, Group, ActionIcon, Button, ScrollArea, Divider } from "@mantine/core";
+import { Box, Text, Group, ActionIcon, ScrollArea, Divider } from "@mantine/core";
 import { ArrowLeftIcon, CheckIcon } from "@phosphor-icons/react";
 import { useState, ReactNode} from "react";
 import { SlidePanelContext, type PanelConfig } from "./slide-panel-context";
+import Button from "@/components/button";
 
 interface SlidePanelProps {
   children: ReactNode;
diff --git a/src/components/swipeable-tabs.tsx b/src/components/swipeable-tabs.tsx
index 602bde4..f307858 100644
--- a/src/components/swipeable-tabs.tsx
+++ b/src/components/swipeable-tabs.tsx
@@ -1,4 +1,4 @@
-import { FloatingIndicator, UnstyledButton, Box, Text } from "@mantine/core";
+import { FloatingIndicator, UnstyledButton, Box, Text, ScrollArea } from "@mantine/core";
 import { Carousel } from "@mantine/carousel";
 import { useState, useEffect, ReactNode } from "react";
 
diff --git a/src/features/admin/components/edit-tournament.tsx b/src/features/admin/components/edit-tournament.tsx
new file mode 100644
index 0000000..86d2200
--- /dev/null
+++ b/src/features/admin/components/edit-tournament.tsx
@@ -0,0 +1,193 @@
+import { Box, FileInput, Group, Stack, TextInput, Textarea, Title } from "@mantine/core";
+import { useForm, UseFormInput } from "@mantine/form";
+import { LinkIcon } from "@phosphor-icons/react";
+import { Tournament, TournamentFormInput } from "@/features/tournaments/types";
+import { DateInputSheet } from "../../../components/date-input";
+import { isNotEmpty } from "@mantine/form";
+import toast from '@/lib/sonner';
+import { logger } from "..";
+import { useQueryClient, useMutation } from "@tanstack/react-query";
+import { tournamentQueries } from "@/features/tournaments/queries";
+import { updateTournament } from "@/features/tournaments/server";
+import { useRouter } from "@tanstack/react-router";
+import Button from "@/components/button";
+
+interface EditTournamentProps {
+  tournament: Tournament;
+}
+
+const EditTournament = ({ tournament }: EditTournamentProps) => {
+  const router = useRouter();
+  const queryClient = useQueryClient();
+
+  const config: UseFormInput<TournamentFormInput> = {
+    initialValues: {
+      name: tournament.name || '',
+      location: tournament.location || '',
+      desc: tournament.desc || '',
+      start_time: tournament.start_time || '',
+      enroll_time: tournament.enroll_time || '',
+      end_time: tournament.end_time || '',
+      rules: tournament.rules || '',
+      logo: undefined, // Always start with no file selected
+    },
+    onSubmitPreventDefault: 'always',
+    validate: {
+      name: isNotEmpty('Name is required'),
+      location: isNotEmpty('Location is required'),
+      start_time: isNotEmpty('Start time is required'),
+      enroll_time: isNotEmpty('Enrollment time is required'),
+    }
+  };
+
+  const form = useForm(config);
+
+  const { mutate: editTournament, isPending } = useMutation({
+    mutationFn: (data: Partial<TournamentFormInput>) => 
+      updateTournament({ data: { id: tournament.id, updates: data } }),
+    onSuccess: (updatedTournament) => {
+      if (updatedTournament) {
+        queryClient.invalidateQueries({ queryKey: tournamentQueries.list().queryKey });
+        queryClient.setQueryData(
+          tournamentQueries.details(updatedTournament.id).queryKey,
+          updatedTournament
+        );
+      }
+    }
+  });
+
+  const handleSubmit = async (values: TournamentFormInput) => {
+    const { logo, ...tournamentData } = values;
+    
+    editTournament(tournamentData, {
+      onSuccess: async (updatedTournament) => {
+        if (logo && updatedTournament) {
+          try {
+            const formData = new FormData();
+            formData.append('tournamentId', updatedTournament.id);
+            formData.append('logo', logo);
+
+            const response = await fetch('/api/tournaments/upload-logo', {
+              method: 'POST',
+              body: formData,
+            });
+
+            if (!response.ok) {
+              const error = await response.json();
+              throw new Error(error.error || 'Failed to upload logo');
+            }
+
+            const result = await response.json();
+            
+            queryClient.setQueryData(
+              tournamentQueries.details(result.tournament!.id).queryKey,
+              result.tournament
+            );
+            
+            toast.success('Tournament updated successfully!');
+          } catch (error: any) {
+            toast.error(`Tournament updated but logo upload failed: ${error.message}`);
+            logger.error('Tournament logo upload error', error);
+          }
+        } else {
+          toast.success('Tournament updated successfully!');
+        }
+        
+        router.history.back();
+      },
+      onError: (error: any) => {
+        toast.error(`Failed to update tournament: ${error.message}`);
+        logger.error('Tournament update error', error);
+      }
+    });
+  };
+
+  return (
+    <Box w="100%" maw={600} mx="auto" p="lg">
+      <Stack gap="lg">
+        <Title order={2}>Edit Tournament</Title>
+        
+        <form onSubmit={form.onSubmit(handleSubmit)}>
+          <Stack gap="md">
+            <TextInput
+              label="Name"
+              withAsterisk
+              key={form.key('name')}
+              {...form.getInputProps('name')}
+            />
+            
+            <TextInput
+              label="Location"
+              withAsterisk
+              key={form.key('location')}
+              {...form.getInputProps('location')}
+            />
+
+            <Textarea
+              label="Description"
+              key={form.key('desc')}
+              {...form.getInputProps('desc')}
+              minRows={3}
+            />
+
+            <Textarea
+              label="Rules"
+              key={form.key('rules')}
+              {...form.getInputProps('rules')}
+              minRows={4}
+            />
+
+            <FileInput
+              key={form.key('logo')}
+              accept="image/png,image/jpeg,image/gif,image/jpg"
+              label="Change Logo"
+              leftSection={<LinkIcon size={16} />}
+              {...form.getInputProps('logo')}
+            />
+
+            <DateInputSheet
+              label="Start Date"
+              withAsterisk
+              value={form.values.start_time}
+              onChange={(value) => form.setFieldValue('start_time', value)}
+              error={form.errors.start_time}
+            />
+
+            <DateInputSheet
+              label="Enrollment Due"
+              withAsterisk
+              value={form.values.enroll_time}
+              onChange={(value) => form.setFieldValue('enroll_time', value)}
+              error={form.errors.enroll_time}
+            />
+
+            <DateInputSheet
+              label="End Date (Optional)"
+              value={form.values.end_time || ''}
+              onChange={(value) => form.setFieldValue('end_time', value)}
+              error={form.errors.end_time}
+            />
+
+            <Group justify="flex-end" mt="lg">
+              <Button 
+                variant="light" 
+                onClick={() => router.history.back()}
+                disabled={isPending}
+              >
+                Cancel
+              </Button>
+              <Button 
+                type="submit" 
+                loading={isPending}
+              >
+                Update Tournament
+              </Button>
+            </Group>
+          </Stack>
+        </form>
+      </Stack>
+    </Box>
+  );
+};
+
+export default EditTournament;
\ No newline at end of file
diff --git a/src/components/providers.tsx b/src/features/core/components/providers.tsx
similarity index 100%
rename from src/components/providers.tsx
rename to src/features/core/components/providers.tsx
diff --git a/src/features/login/components/name-prompt.tsx b/src/features/login/components/name-prompt.tsx
index 3f93c32..9898276 100644
--- a/src/features/login/components/name-prompt.tsx
+++ b/src/features/login/components/name-prompt.tsx
@@ -1,6 +1,7 @@
-import { Button, TextInput } from "@mantine/core";
+import { TextInput } from "@mantine/core";
 import { useForm } from "@mantine/form";
 import useCreateUser from "../hooks/use-create-user";
+import Button from "@/components/button";
 
 const NamePrompt = () => {  
   const form = useForm({
@@ -41,7 +42,7 @@ const NamePrompt = () => {
         key={form.key('last_name')}
         {...form.getInputProps('last_name')}
       />
-      <Button loading={isPending} type='submit' w='100%' mt='10px' variant='filled'>Create Account</Button>
+      <Button loading={isPending} type='submit' mt='10px' variant='filled'>Create Account</Button>
     </form>
   )
 }
diff --git a/src/features/login/components/player-prompt/existing-player-button.tsx b/src/features/login/components/player-prompt/existing-player-button.tsx
index 10e2dfa..477f809 100644
--- a/src/features/login/components/player-prompt/existing-player-button.tsx
+++ b/src/features/login/components/player-prompt/existing-player-button.tsx
@@ -1,4 +1,5 @@
-import { Button, Center, ElementProps, SimpleGrid, Text } from "@mantine/core";
+import Button from "@/components/button";
+import { Center, ElementProps, SimpleGrid, Text } from "@mantine/core";
 import { ChalkboardTeacherIcon } from "@phosphor-icons/react";
 
 const ExistingPlayerButton: React.FC<ElementProps<"button">> = ({ onClick }) => {
diff --git a/src/features/login/components/player-prompt/index.tsx b/src/features/login/components/player-prompt/index.tsx
index 65c8591..b53b9c7 100644
--- a/src/features/login/components/player-prompt/index.tsx
+++ b/src/features/login/components/player-prompt/index.tsx
@@ -1,13 +1,14 @@
 import { useState, FormEventHandler, useMemo } from 'react';
 import { ArrowLeftIcon } from '@phosphor-icons/react';
 import { useQuery } from '@tanstack/react-query';
-import {  Autocomplete, Button, Divider, Flex, Text, TextInput, Title, UnstyledButton } from '@mantine/core';
+import {  Autocomplete, Divider, Flex, Text, TextInput, Title, UnstyledButton } from '@mantine/core';
 import ExistingPlayerButton from './existing-player-button';
 import NewPlayerButton from './new-player-button';
 import { Player } from '@/features/players/types';
 import { toast } from 'sonner';
 import { playerQueries } from '@/features/players/queries';
 import useCreateUser from '../../hooks/use-create-user';
+import Button from '@/components/button';
 
 enum PlayerPromptStage {
   returning = 'returning',
@@ -109,7 +110,7 @@ const PlayerPrompt = () => {
             value={value}
             onChange={handleNewPlayerChange}
           />
-          <Button type='submit' w='100%' mt='10px' color='green' variant='filled'>Submit</Button>
+          <Button type='submit' mt='10px' color='green' variant='filled'>Submit</Button>
         </form>
         </> :
         <form onSubmit={formSubmitHandler(handlePlayerSubmit)}>
@@ -120,7 +121,7 @@ const PlayerPrompt = () => {
             onChange={handleReturningPlayerChange}
             error={error}
           />
-          <Button type='submit' w='100%' mt='10px' color='green' variant='filled'>Submit</Button>
+          <Button type='submit' mt='10px' color='green' variant='filled'>Submit</Button>
         </form>
     }
   </>
diff --git a/src/features/login/components/player-prompt/new-player-button.tsx b/src/features/login/components/player-prompt/new-player-button.tsx
index 40c5249..a3a8ef5 100644
--- a/src/features/login/components/player-prompt/new-player-button.tsx
+++ b/src/features/login/components/player-prompt/new-player-button.tsx
@@ -1,4 +1,5 @@
-import { Button, Center, ElementProps, SimpleGrid, Text } from "@mantine/core";
+import Button from "@/components/button";
+import { Center, ElementProps, SimpleGrid, Text } from "@mantine/core";
 import { UserPlusIcon } from "@phosphor-icons/react";
 
 const NewPlayerButton: React.FC<ElementProps<"button">> = ({ onClick }) => {
diff --git a/src/features/players/components/profile/index.tsx b/src/features/players/components/profile/index.tsx
index a37e5b6..eac6910 100644
--- a/src/features/players/components/profile/index.tsx
+++ b/src/features/players/components/profile/index.tsx
@@ -15,15 +15,15 @@ const Profile = ({ player }: ProfileProps) => {
       label: "Overview",
       content: <Text p="md">Stats/Badges will go here</Text>
     },
+    {
+      label: "Matches",
+      content: <Text p="md">Matches feed will go here</Text>
+    },
     {
       label: "Teams", 
       content: <>
         <TeamList teams={player.teams || []} />
       </>
-    },
-    {
-      label: "Tournaments",
-      content: <Text p="md">Panel 3 content</Text>
     }
   ];
 
diff --git a/src/features/players/components/profile/name-form.tsx b/src/features/players/components/profile/name-form.tsx
index 70dc47b..fec34c5 100644
--- a/src/features/players/components/profile/name-form.tsx
+++ b/src/features/players/components/profile/name-form.tsx
@@ -1,10 +1,11 @@
 import { updatePlayer } from "@/features/players/server";
 import { useMutation } from "@tanstack/react-query";
-import { Button, Stack, TextInput } from "@mantine/core"
+import { Stack, TextInput } from "@mantine/core"
 import { useForm } from "@mantine/form";
 import toast from "@/lib/sonner";
 import { useRouter } from "@tanstack/react-router";
 import { Player } from "../../types";
+import Button from "@/components/button";
 
 interface NameUpdateFormProps {
 	player: Player;
@@ -50,8 +51,8 @@ const NameUpdateForm = ({ player, toggle }: NameUpdateFormProps) => {
 			<Stack gap='xs'>
 				<TextInput label='First Name' {...form.getInputProps('first_name')} />
 				<TextInput label='Last Name' {...form.getInputProps('last_name')} />
-				<Button fullWidth loading={isPending} type='submit'>Save</Button>
-				<Button fullWidth variant='subtle' color='red' onClick={toggle}>Cancel</Button>
+				<Button loading={isPending} type='submit'>Save</Button>
+				<Button variant='subtle' color='red' onClick={toggle}>Cancel</Button>
 			</Stack>
 		</form>
 	)
diff --git a/src/features/tournaments/components/profile/header.tsx b/src/features/tournaments/components/profile/header.tsx
new file mode 100644
index 0000000..1a24e8b
--- /dev/null
+++ b/src/features/tournaments/components/profile/header.tsx
@@ -0,0 +1,23 @@
+import { Flex, Title } from "@mantine/core";
+import Avatar from "@/components/avatar";
+import { Tournament } from "../../types";
+
+interface HeaderProps {
+  tournament: Tournament;
+}
+
+const Header = ({ tournament }: HeaderProps) => {
+
+  return (
+    <>
+      <Flex px='xl' w='100%' align='self-end' gap='md'>
+        <Avatar name={tournament.name} radius={0} withBorder={false} size={125} src={`/api/files/tournaments/${tournament.id}/${tournament.logo}`} />
+        <Flex align='center' justify='center' gap={4} pb={20} w='100%'>
+          <Title ta='center' order={2}>{tournament.name}</Title>
+        </Flex>
+      </Flex>
+    </>
+  )
+};
+
+export default Header;
\ No newline at end of file
diff --git a/src/features/tournaments/components/profile/index.tsx b/src/features/tournaments/components/profile/index.tsx
new file mode 100644
index 0000000..5882565
--- /dev/null
+++ b/src/features/tournaments/components/profile/index.tsx
@@ -0,0 +1,38 @@
+import { Box, Divider, Text } from "@mantine/core";
+import Header from "./header";
+import TeamList from "@/features/teams/components/team-list";
+import SwipeableTabs from "@/components/swipeable-tabs";
+import { Tournament } from "../../types";
+import { PreviewBracket } from "@/features/bracket/components/preview";
+
+interface ProfileProps {
+  tournament: Tournament;
+}
+
+const Profile = ({ tournament }: ProfileProps) => {
+  const tabs = [
+    {
+      label: "Overview",
+      content: <Text p="md">Stats/Badges will go here, bracket link</Text>
+    },
+    {
+      label: "Matches",
+      content: <Text p="md">Matches feed will go here</Text>
+    },
+    {
+      label: "Teams", 
+      content: <>
+        <TeamList teams={tournament.teams || []} />
+      </>
+    }
+  ];
+
+  return <>
+    <Header tournament={tournament} />
+    <Box m='sm' mt='lg'>
+      <SwipeableTabs tabs={tabs} />
+    </Box>
+  </>;
+};
+
+export default Profile;
diff --git a/src/features/tournaments/components/tournament-list.tsx b/src/features/tournaments/components/tournament-list.tsx
new file mode 100644
index 0000000..eb88976
--- /dev/null
+++ b/src/features/tournaments/components/tournament-list.tsx
@@ -0,0 +1,40 @@
+import { List, ListItem, Skeleton, Text } from "@mantine/core";
+import { useNavigate } from "@tanstack/react-router";
+import Avatar from "@/components/avatar";
+import { Tournament } from "../types";
+
+interface TournamentListProps {
+  tournaments: Tournament[];
+  loading?: boolean;
+}
+
+const TournamentList = ({ tournaments, loading = false }: TournamentListProps) => {
+  const navigate = useNavigate();
+  
+  if (loading) return <List>
+    {Array.from({ length: 10 }).map((_, i) => (
+      <ListItem py='xs'
+        icon={<Skeleton height={40} width={40} />}
+      >
+        <Skeleton height={20} width={200} />
+      </ListItem>
+    ))}
+  </List>
+
+  return <List>
+    {tournaments?.map((tournament) => (
+      <ListItem key={tournament.id}
+        py='xs'
+        icon={<Avatar radius='xs' size={40} name={`${tournament.name}`} src={`/api/files/tournaments/${tournament.id}/${tournament.logo}`} />}
+        style={{ cursor: 'pointer' }}
+        onClick={() => {
+          navigate({ to: `/tournaments/${tournament.id}` });
+        }}
+      >
+        <Text fw={500}>{`${tournament.name}`}</Text>
+      </ListItem>
+    ))}
+  </List>
+}
+
+export default TournamentList;
diff --git a/src/features/tournaments/server.ts b/src/features/tournaments/server.ts
index 70ed5e5..84d10e0 100644
--- a/src/features/tournaments/server.ts
+++ b/src/features/tournaments/server.ts
@@ -33,6 +33,24 @@ export const createTournament = createServerFn()
     }
   });
 
+export const updateTournament = createServerFn()
+  .validator(z.object({
+    id: z.string(),
+    updates: tournamentInputSchema.partial()
+  }))
+  .middleware([superTokensAdminFunctionMiddleware])
+  .handler(async ({ data }) => {
+    try {
+      logger.info('Updating tournament', data);
+      
+      const tournament = await pbAdmin.updateTournament(data.id, data.updates);
+      return tournament;
+    } catch (error) {
+      logger.error('Error updating tournament', error);
+      return null;
+    }
+  });
+
 export const getTournament = createServerFn()
   .validator(z.string())
   .middleware([superTokensFunctionMiddleware])
diff --git a/src/lib/pocketbase/services/tournaments.ts b/src/lib/pocketbase/services/tournaments.ts
index 25db756..edc729b 100644
--- a/src/lib/pocketbase/services/tournaments.ts
+++ b/src/lib/pocketbase/services/tournaments.ts
@@ -38,7 +38,7 @@ export function createTournamentsService(pb: PocketBase) {
     },
     async updateTournament(
       id: string,
-      data: TournamentUpdateInput
+      data: Partial<TournamentUpdateInput>
     ): Promise<Tournament> {
       const result = await pb
         .collection("tournaments")