diff --git a/.claude/settings.local.json b/.claude/settings.local.json
index db48442..2ae7a49 100644
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@@ -11,7 +11,9 @@
       "Bash(ren:*)",
       "Bash(npx supabase:*)",
       "Bash(libs/service/src/types/supabase.ts)",
-      "Bash(npx nx build:*)"
+      "Bash(npx nx build:*)",
+      "Bash(git add:*)",
+      "Bash(git commit:*)"
     ],
     "deny": [],
     "ask": []
diff --git a/apps/hackathon/src/app/teams/[teamId]/page.tsx b/apps/hackathon/src/app/teams/[teamId]/page.tsx
index 572f495..6d46602 100644
--- a/apps/hackathon/src/app/teams/[teamId]/page.tsx
+++ b/apps/hackathon/src/app/teams/[teamId]/page.tsx
@@ -369,29 +369,34 @@ const TeamDashboardPage: FC = (): ReactElement => {
                   Team Management
                 </h2>
                 <div className="grid gap-3 sm:grid-cols-2">
-                  <Button
-                    className="w-full"
-                    variant="secondary"
-                    onClick={() => setShowInviteModal(true)}
-                    disabled={!canInvite}
-                  >
-                    <Icon icon="mdi:plus" className="inline-block mr-2" />
-                    Invite Member{' '}
-                    {!canInvite && `(${members.length}/${MAX_TEAM_MEMBERS})`}
-                  </Button>
-                  <Button
-                    className="w-full relative"
-                    variant="secondary"
-                    onClick={() => setShowJoinRequestsModal(true)}
-                  >
-                    <Icon icon="mdi:email" className="inline-block mr-2" /> Join
-                    Requests
-                    {pendingJoinRequests.length > 0 && (
-                      <span className="absolute -top-2 -right-2 bg-red-500 text-white text-xs font-bold rounded-full w-6 h-6 flex items-center justify-center">
-                        {pendingJoinRequests.length}
-                      </span>
-                    )}
-                  </Button>
+                  {/* Hide invite/join management after submission */}
+                  {!team.has_submission && (
+                    <>
+                      <Button
+                        className="w-full"
+                        variant="secondary"
+                        onClick={() => setShowInviteModal(true)}
+                        disabled={!canInvite}
+                      >
+                        <Icon icon="mdi:plus" className="inline-block mr-2" />
+                        Invite Member{' '}
+                        {!canInvite && `(${members.length}/${MAX_TEAM_MEMBERS})`}
+                      </Button>
+                      <Button
+                        className="w-full relative"
+                        variant="secondary"
+                        onClick={() => setShowJoinRequestsModal(true)}
+                      >
+                        <Icon icon="mdi:email" className="inline-block mr-2" /> Join
+                        Requests
+                        {pendingJoinRequests.length > 0 && (
+                          <span className="absolute -top-2 -right-2 bg-red-500 text-white text-xs font-bold rounded-full w-6 h-6 flex items-center justify-center">
+                            {pendingJoinRequests.length}
+                          </span>
+                        )}
+                      </Button>
+                    </>
+                  )}
                   <Link to={`/teams/${teamId}/edit`}>
                     <Button className="w-full" variant="secondary">
                       <Icon icon="mdi:pencil" className="inline-block mr-2" />
@@ -404,7 +409,7 @@ const TeamDashboardPage: FC = (): ReactElement => {
                         icon="mdi:account-group"
                         className="inline-block mr-2"
                       />
-                      Manage Members
+                      View Members
                     </Button>
                   </Link>
                   <Link to={`/teams/${teamId}/chat`}>
@@ -413,20 +418,29 @@ const TeamDashboardPage: FC = (): ReactElement => {
                       Team Chat
                     </Button>
                   </Link>
-                  <Link to={`/teams/${teamId}/submit`}>
-                    <Button className="w-full">
-                      <Icon icon="mdi:rocket" className="inline-block mr-2" />
-                      Submit Project
-                    </Button>
-                  </Link>
+                  {team.has_submission ? (
+                    <Link to={`/teams/${teamId}/submission`}>
+                      <Button className="w-full" variant="secondary">
+                        <Icon icon="mdi:file-document" className="inline-block mr-2" />
+                        View Submission
+                      </Button>
+                    </Link>
+                  ) : (
+                    <Link to={`/teams/${teamId}/submit`}>
+                      <Button className="w-full">
+                        <Icon icon="mdi:rocket" className="inline-block mr-2" />
+                        Submit Project
+                      </Button>
+                    </Link>
+                  )}
                 </div>
-                {!canInvite && members.length >= MAX_TEAM_MEMBERS && (
+                {!team.has_submission && !canInvite && members.length >= MAX_TEAM_MEMBERS && (
                   <p className="text-sm text-gray-600 dark:text-gray-400 mt-3 text-center">
                     Maximum team size reached ({MAX_TEAM_MEMBERS} members)
                   </p>
                 )}
-                {/* Danger Zone - Only show when leader is alone */}
-                {members.length === 1 && (
+                {/* Danger Zone - Only show when leader is alone and no submission */}
+                {members.length === 1 && !team.has_submission && (
                   <div className="mt-6 pt-4 border-t border-gray-200 dark:border-gray-700">
                     <h3 className="text-sm font-medium text-red-600 dark:text-red-400 mb-3">
                       Danger Zone
diff --git a/apps/hackathon/src/app/teams/browse/page.tsx b/apps/hackathon/src/app/teams/browse/page.tsx
index 688a5f1..8fef126 100644
--- a/apps/hackathon/src/app/teams/browse/page.tsx
+++ b/apps/hackathon/src/app/teams/browse/page.tsx
@@ -199,18 +199,18 @@ const BrowseTeamsPage: FC = (): ReactElement => {
                         </div>
                       )}
                       <div className="flex-1 min-w-0">
-                        <div className="flex items-center gap-2">
-                          <h3 className="text-lg font-bold text-gray-900 dark:text-white line-clamp-2 leading-tight">
+                        <div className="flex items-start gap-2">
+                          <h3 className="text-lg font-bold text-gray-900 dark:text-white line-clamp-1 leading-tight flex-1 min-w-0">
                             {team.name}
                           </h3>
                           {team.has_submission && (
-                            <span className="inline-flex items-center gap-1 px-2 py-0.5 rounded-full text-xs font-medium bg-green-100 dark:bg-green-900/30 text-green-700 dark:text-green-400 shrink-0">
+                            <span className="inline-flex items-center gap-1 px-2 py-0.5 rounded-full text-xs font-medium bg-green-100 dark:bg-green-900/30 text-green-700 dark:text-green-400 shrink-0 mt-0.5">
                               <Icon icon="mdi:check-circle" className="text-sm" />
                               Submitted
                             </span>
                           )}
                         </div>
-                        <div className="text-sm font-sans text-gray-600 dark:text-gray-400 flex gap-2">
+                        <div className="text-sm font-sans text-gray-600 dark:text-gray-400 flex gap-2 mt-1">
                           <p className="truncate flex-1 min-w-0 flex items-center gap-x-1">
                             <Icon icon="mdi:map-marker" />{' '}
                             <span>{team.city}</span>
@@ -237,7 +237,8 @@ const BrowseTeamsPage: FC = (): ReactElement => {
                       ) : (
                         <>
                           {myTeams.length === 0 &&
-                            (team.member_count || 0) < 5 && (
+                            (team.member_count || 0) < 5 &&
+                            !team.has_submission && (
                               <Button
                                 className="w-full"
                                 onClick={() => handleJoinRequest(team.id)}