diff --git a/netlify/functions/dashboard.ts b/netlify/functions/dashboard.ts
index 8e16466..b6c2ca1 100644
--- a/netlify/functions/dashboard.ts
+++ b/netlify/functions/dashboard.ts
@@ -3,6 +3,9 @@ import { authenticateUser, supabase, logError } from "../utils";
 import * as R from "ramda";
 import { addDays, endOfDay } from "date-fns";
 
+const SESSION_WITH_GAME_AND_COMMUNITY_INFO =
+  "*, game_id(*, community_events(*), sessions(*), community_id(*))";
+
 export const handler: Handler = async (event) => {
   const today = new Date();
   const sevenDaysFromNow = endOfDay(addDays(today, 7));
@@ -11,7 +14,7 @@ export const handler: Handler = async (event) => {
   // load open games in next 7 days
   const { data: openGames, error: openGamesError } = await supabase
     .from("sessions")
-    .select("*, game_id(*, community_events(*), sessions(*))")
+    .select(SESSION_WITH_GAME_AND_COMMUNITY_INFO)
     .is("deleted_at", null)
     .gte("start_time", today.getTime())
     .lte("end_time", sevenDaysFromNow.getTime())
@@ -47,9 +50,7 @@ export const handler: Handler = async (event) => {
   // load sessions playing in next 7 days
   const { data: playing, error: playingError } = await supabase
     .from("sessions")
-    .select(
-      "*, game_id(title, id, event_id(id, title), sessions(*)), community_id(name, id, url_short_name)",
-    )
+    .select(SESSION_WITH_GAME_AND_COMMUNITY_INFO)
     .is("deleted_at", null)
     .contains("rsvps", [user.data.user.id])
     .gte("start_time", today.getTime())
@@ -63,9 +64,7 @@ export const handler: Handler = async (event) => {
   // load sessions managing in next 7 days
   const { data: managing, error: managingError } = await supabase
     .from("sessions")
-    .select(
-      "*, game_id(title, id, event_id(id, title), sessions(*)), community_id(name, id, url_short_name)",
-    )
+    .select(SESSION_WITH_GAME_AND_COMMUNITY_INFO)
     .is("deleted_at", null)
     .eq("creator_id", user.data.user.id)
     .gte("start_time", today.getTime())
@@ -138,7 +137,7 @@ export const handler: Handler = async (event) => {
   // load open games in next 7 days
   const { data: games, error: gamesError } = await supabase
     .from("sessions")
-    .select("*, game_id(*, community_events(*), sessions(*))")
+    .select(SESSION_WITH_GAME_AND_COMMUNITY_INFO)
     .is("deleted_at", null)
     .neq("creator_id", user.data.user.id)
     .in("community_id", communityIds)
diff --git a/package-lock.json b/package-lock.json
index 016f6a6..5e1e4d0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -75,7 +75,6 @@
         "postcss-nesting": "~12.0.1",
         "prettier": "3.0.3",
         "stripe": "^12.11.0",
-        "supabase": "^1.100.1",
         "tailwindcss": "~3.3.2",
         "typescript": "^5.1.6",
         "vite": "^4.4.11",
@@ -4875,21 +4874,6 @@
         "node": "*"
       }
     },
-    "node_modules/bin-links": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/bin-links/-/bin-links-4.0.2.tgz",
-      "integrity": "sha512-jxJ0PbXR8eQyPlExCvCs3JFnikvs1Yp4gUJt6nmgathdOwvur+q22KWC3h20gvWl4T/14DXKj2IlkJwwZkZPOw==",
-      "dev": true,
-      "dependencies": {
-        "cmd-shim": "^6.0.0",
-        "npm-normalize-package-bin": "^3.0.0",
-        "read-cmd-shim": "^4.0.0",
-        "write-file-atomic": "^5.0.0"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
     "node_modules/binary-extensions": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
@@ -5222,15 +5206,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/chownr": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/ci-info": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.3.0.tgz",
@@ -5307,15 +5282,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/cmd-shim": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-6.0.1.tgz",
-      "integrity": "sha512-S9iI9y0nKR4hwEQsVWpyxld/6kRfGepGfzff83FcaiEBpmvlbA2nnGe7Cylgrx2f/p1P5S5wpRm9oL8z1PbS3Q==",
-      "dev": true,
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
     "node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -5574,15 +5540,6 @@
         "node": ">=0.10"
       }
     },
-    "node_modules/data-uri-to-buffer": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz",
-      "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 12"
-      }
-    },
     "node_modules/date-fns": {
       "version": "2.30.0",
       "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz",
@@ -6768,29 +6725,6 @@
       "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz",
       "integrity": "sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw=="
     },
-    "node_modules/fetch-blob": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz",
-      "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/jimmywarting"
-        },
-        {
-          "type": "paypal",
-          "url": "https://paypal.me/jimmywarting"
-        }
-      ],
-      "dependencies": {
-        "node-domexception": "^1.0.0",
-        "web-streams-polyfill": "^3.0.3"
-      },
-      "engines": {
-        "node": "^12.20 || >= 14.13"
-      }
-    },
     "node_modules/fflate": {
       "version": "0.7.4",
       "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.7.4.tgz",
@@ -6941,18 +6875,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/formdata-polyfill": {
-      "version": "4.0.10",
-      "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz",
-      "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==",
-      "dev": true,
-      "dependencies": {
-        "fetch-blob": "^3.1.2"
-      },
-      "engines": {
-        "node": ">=12.20.0"
-      }
-    },
     "node_modules/fraction.js": {
       "version": "4.3.6",
       "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.6.tgz",
@@ -6981,30 +6903,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/fs-minipass": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
-      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
-      "dev": true,
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/fs-minipass/node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -8516,57 +8414,11 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/minipass": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
-      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minizlib": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
-      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
-      "dev": true,
-      "dependencies": {
-        "minipass": "^3.0.0",
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/minizlib/node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/mitt": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz",
       "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw=="
     },
-    "node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "dev": true,
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/mlly": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.4.2.tgz",
@@ -26432,25 +26284,6 @@
       "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
       "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw= sha512-mc/caHeUcdjnC/boPWJefDr4KUIWQNv+tlnFnJd38QMou86QtxQzBJfxgGRzvx8jazYRqrVlaHarfO72uNxPOg=="
     },
-    "node_modules/node-domexception": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz",
-      "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/jimmywarting"
-        },
-        {
-          "type": "github",
-          "url": "https://paypal.me/jimmywarting"
-        }
-      ],
-      "engines": {
-        "node": ">=10.5.0"
-      }
-    },
     "node_modules/node-fetch": {
       "version": "2.6.7",
       "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
@@ -26504,15 +26337,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/npm-normalize-package-bin": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz",
-      "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==",
-      "dev": true,
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
     "node_modules/npm-run-path": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
@@ -27452,15 +27276,6 @@
         "pify": "^2.3.0"
       }
     },
-    "node_modules/read-cmd-shim": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-4.0.0.tgz",
-      "integrity": "sha512-yILWifhaSEEytfXI76kB9xEEiG1AiozaCJZ83A87ytjRiN+jVibXjedjCRNjoZviinhG+4UkalO3mWTd8u5O0Q==",
-      "dev": true,
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
     "node_modules/readable-stream": {
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
@@ -28189,43 +28004,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/supabase": {
-      "version": "1.100.1",
-      "resolved": "https://registry.npmjs.org/supabase/-/supabase-1.100.1.tgz",
-      "integrity": "sha512-Tn03fjNGiCoJ06ZeBtCmaNj3Kqf2UzM8bpptiIrP7g5wPmAHL8MTDM2ZEemkRxAWAm2E+fcb8zGOSNbh0RCQGQ==",
-      "dev": true,
-      "hasInstallScript": true,
-      "dependencies": {
-        "bin-links": "^4.0.1",
-        "https-proxy-agent": "^7.0.2",
-        "node-fetch": "^3.2.10",
-        "tar": "6.2.0"
-      },
-      "bin": {
-        "supabase": "bin/supabase"
-      },
-      "engines": {
-        "npm": ">=8"
-      }
-    },
-    "node_modules/supabase/node_modules/node-fetch": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz",
-      "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==",
-      "dev": true,
-      "dependencies": {
-        "data-uri-to-buffer": "^4.0.0",
-        "fetch-blob": "^3.1.4",
-        "formdata-polyfill": "^4.0.10"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/node-fetch"
-      }
-    },
     "node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -28368,23 +28146,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/tar": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz",
-      "integrity": "sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==",
-      "dev": true,
-      "dependencies": {
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "minipass": "^5.0.0",
-        "minizlib": "^2.1.1",
-        "mkdirp": "^1.0.3",
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
@@ -29285,15 +29046,6 @@
       "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
       "dev": true
     },
-    "node_modules/web-streams-polyfill": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz",
-      "integrity": "sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/web-vitals": {
       "version": "3.5.0",
       "resolved": "https://registry.npmjs.org/web-vitals/-/web-vitals-3.5.0.tgz",
@@ -29443,31 +29195,6 @@
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
       "dev": true
     },
-    "node_modules/write-file-atomic": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz",
-      "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==",
-      "dev": true,
-      "dependencies": {
-        "imurmurhash": "^0.1.4",
-        "signal-exit": "^4.0.1"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/write-file-atomic/node_modules/signal-exit": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-      "dev": true,
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/ws": {
       "version": "7.5.9",
       "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
diff --git a/package.json b/package.json
index f16d580..ddaaa25 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,6 @@
     "postcss-nesting": "~12.0.1",
     "prettier": "3.0.3",
     "stripe": "^12.11.0",
-    "supabase": "^1.100.1",
     "tailwindcss": "~3.3.2",
     "typescript": "^5.1.6",
     "vite": "^4.4.11",
diff --git a/src/App.vue b/src/App.vue
index f43bb18..84f05ed 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,9 +1,6 @@
 <template>
   <AppShell>
-    <div v-if="loadingUser" class="grow grid place-content-center">
-      <LoadingSpinner color="brand-500" />
-    </div>
-    <router-view v-else></router-view>
+    <router-view></router-view>
     <ToasterManager />
     <NewProfileModal
       :open="showNewProfileModal"
@@ -56,7 +53,6 @@ import { onMounted, ref } from "vue";
 import { loadProfile } from "./api/profiles";
 import { log } from "./util/logger";
 import AppShell from "./layouts/AppShell.vue";
-import LoadingSpinner from "./components/LoadingSpinner.vue";
 import { Notification } from "./typings/Notification";
 import { useStorage, breakpointsTailwind, useBreakpoints } from "@vueuse/core";
 import DismissButton from "./components/Buttons/DismissButton.vue";
@@ -69,7 +65,6 @@ const route = useRoute();
 const router = useRouter();
 
 const showNewProfileModal = ref(false);
-const loadingUser = ref(true);
 const notificationSubscription = ref();
 
 supabase.auth.onAuthStateChange(async (event, session) => {
@@ -163,8 +158,10 @@ async function loadNotificationsAndSubscribe() {
 onMounted(async () => {
   const user = await supabase.auth.getUser();
   if (user.error) {
-    // No logged in user
-    loadingUser.value = false;
+    log({
+      level: "error",
+      message: "Error loading user:" + user.error.message,
+    });
   }
   if (user.data?.user?.id) {
     await Promise.all([
@@ -181,6 +178,5 @@ onMounted(async () => {
       });
     }
   }
-  loadingUser.value = false;
 });
 </script>
diff --git a/src/api/gamesAndSessions.ts b/src/api/gamesAndSessions.ts
index 6e0fe61..2ccff9c 100644
--- a/src/api/gamesAndSessions.ts
+++ b/src/api/gamesAndSessions.ts
@@ -300,7 +300,7 @@ export async function loadOpenCommunitySessions({
 }) {
   const { data, error } = await supabase
     .from("sessions")
-    .select("*, game_id(*, community_events(*))")
+    .select("*, game_id(*, community_events(*), sessions(*), community_id(*))")
     .is("deleted_at", null)
     .eq("community_id", communityId)
     .eq("has_openings", true)
@@ -328,7 +328,7 @@ export async function loadAllCommunitySessions({
 }) {
   const { data, error } = await supabase
     .from("sessions")
-    .select("*, game_id(*, community_events(*))")
+    .select("*, game_id(*, community_events(*), sessions(*), community_id(*))")
     .is("deleted_at", null)
     .eq("community_id", communityId)
     .gte("start_time", startOfDay(startDate).getTime())
@@ -347,7 +347,9 @@ export async function loadAllCommunitySessions({
 export async function loadOpenEventSessions({ eventId }: { eventId: number }) {
   const { data, error } = await supabase
     .from("sessions")
-    .select("*, game_id!inner(*)")
+    .select(
+      "*, game_id!inner(*, community_events(*), sessions(*), community_id(*))",
+    )
     .is("deleted_at", null)
     .eq("has_openings", true)
     .eq("game_id.event_id", eventId)
@@ -363,7 +365,9 @@ export async function loadOpenEventSessions({ eventId }: { eventId: number }) {
 export async function loadEventSessions({ eventId }: { eventId: number }) {
   const { data, error } = await supabase
     .from("sessions")
-    .select("*, game_id!inner(*)")
+    .select(
+      "*, game_id!inner(*, community_events(*), sessions(*), community_id(*))",
+    )
     .is("deleted_at", null)
     .eq("game_id.event_id", eventId)
     .order("start_time", { ascending: true });
diff --git a/src/pages/Community/CalendarView.vue b/src/pages/Community/CalendarView.vue
index 951a3c9..28a1bbd 100644
--- a/src/pages/Community/CalendarView.vue
+++ b/src/pages/Community/CalendarView.vue
@@ -60,20 +60,20 @@
 <script setup lang="ts">
 import { PropType } from "vue";
 import { isSameDay, format } from "date-fns";
-import { GameSession } from "@/typings/Session";
 import DisplayCalendar from "@/components/Calendar/DisplayCalendar.vue";
 
 import Tooltip from "@/components/Tooltip.vue";
 import Heading from "@/components/Heading.vue";
 import MiniGameItem from "./MiniGameItem.vue";
+import { sessionWithGame } from "../IndexPage.vue";
 
 const props = defineProps({
   sessions: {
-    type: Object as PropType<GameSession[]>,
+    type: Object as PropType<sessionWithGame[]>,
     required: true,
   },
   sessionsByGame: {
-    type: Object as PropType<Record<string, GameSession[]>>,
+    type: Object as PropType<Record<string, sessionWithGame[]>>,
     required: true,
   },
   referenceDate: {
diff --git a/src/pages/Community/CommunityCalendar.vue b/src/pages/Community/CommunityCalendar.vue
index ed2660b..624a43c 100644
--- a/src/pages/Community/CommunityCalendar.vue
+++ b/src/pages/Community/CommunityCalendar.vue
@@ -91,7 +91,9 @@
           <ListView
             :loading="loading"
             :sessions="filteredSessions"
-            :sessions-by-game="sessionsByGame as Record<string, GameSession[]>"
+            :sessions-by-game="
+              sessionsByGame as Record<string, sessionWithGame[]>
+            "
             :reference-date="referenceDate"
             @update-reference-date="onDateChange"
             @refresh="refreshSessions"
@@ -100,7 +102,9 @@
         <TabPanel>
           <CalendarView
             :sessions="filteredSessions"
-            :sessions-by-game="sessionsByGame as Record<string, GameSession[]>"
+            :sessions-by-game="
+              sessionsByGame as Record<string, sessionWithGame[]>
+            "
             :reference-date="referenceDate"
             :selected-date="selectedDate"
             @update-reference-date="onDateChange"
@@ -128,7 +132,6 @@ import {
 } from "@headlessui/vue";
 import { AdjustmentsHorizontalIcon } from "@heroicons/vue/24/outline";
 import FormLabel from "@/components/Forms/FormLabel.vue";
-import { GameSession } from "@/typings/Session";
 import {
   loadOpenCommunitySessions,
   loadAllCommunitySessions,
@@ -140,6 +143,7 @@ import ListView from "./ListView.vue";
 import { store } from "@/store";
 import * as R from "ramda";
 import { useRoute, useRouter } from "vue-router";
+import { sessionWithGame } from "../IndexPage.vue";
 
 const route = useRoute();
 const router = useRouter();
@@ -157,7 +161,7 @@ const options = [
 
 const loading = ref(false);
 
-const sessions = ref<GameSession[]>([]);
+const sessions = ref<sessionWithGame[]>([]);
 const referenceDate = computed(() => {
   if (route.query.date && typeof route.query.date === "string") {
     const date = parse(route.query.date, "yyyy-MM", new Date());
@@ -174,7 +178,7 @@ function onDateChange(date: Date) {
 }
 
 const sessionsByGame = computed(() => {
-  const groupByGame = R.groupBy((session: GameSession) =>
+  const groupByGame = R.groupBy((session: sessionWithGame) =>
     String(session.game_id.id),
   );
   return groupByGame(sessions.value);
diff --git a/src/pages/Community/ListView.vue b/src/pages/Community/ListView.vue
index 5597f7f..7df75b4 100644
--- a/src/pages/Community/ListView.vue
+++ b/src/pages/Community/ListView.vue
@@ -67,22 +67,21 @@ import {
   Squares2X2Icon,
   ListBulletIcon,
 } from "@heroicons/vue/24/outline";
-import { GameSession } from "@/typings/Session";
 import Heading from "@/components/Heading.vue";
 import LoadingSpinner from "@/components/LoadingSpinner.vue";
 import GhostButton from "@/components/Buttons/GhostButton.vue";
 import SecondaryButton from "@/components/Buttons/SecondaryButton.vue";
 import MiniGameItem from "./MiniGameItem.vue";
 import ListViewItem from "./ListViewItem.vue";
-import { CommunityAccess } from "@/typings/CommunityAccess";
+import { sessionWithGame } from "../IndexPage.vue";
 
 const props = defineProps({
   sessions: {
-    type: Object as PropType<GameSession[]>,
+    type: Object as PropType<sessionWithGame[]>,
     required: true,
   },
   sessionsByGame: {
-    type: Object as PropType<Record<string, GameSession[]>>,
+    type: Object as PropType<Record<string, sessionWithGame[]>>,
     required: true,
   },
   referenceDate: {
@@ -107,7 +106,7 @@ const monthSessions = computed(() => {
   const start = startOfMonth(props.referenceDate).getTime();
   const end = endOfMonth(props.referenceDate).getTime();
   return props.sessions.filter(
-    (session) => session.start_time >= start && session.end_time <= end
+    (session) => session.start_time >= start && session.end_time <= end,
   );
 });
 
diff --git a/src/pages/Community/ListViewItem.vue b/src/pages/Community/ListViewItem.vue
index 96b0bd7..7996731 100644
--- a/src/pages/Community/ListViewItem.vue
+++ b/src/pages/Community/ListViewItem.vue
@@ -30,7 +30,7 @@
             intervalToDuration({
               start: session.start_time,
               end: session.end_time,
-            })
+            }),
           )
         }}
       </p>
@@ -147,7 +147,7 @@
                   intervalToDuration({
                     start: related.start_time,
                     end: related.end_time,
-                  })
+                  }),
                 )
               }}
             </li>
@@ -162,7 +162,6 @@ import { computed, PropType } from "vue";
 import { EllipsisHorizontalCircleIcon } from "@heroicons/vue/24/outline";
 import { ChevronRightIcon } from "@heroicons/vue/20/solid";
 import { format, formatDuration, intervalToDuration } from "date-fns";
-import { GameSession } from "@/typings/Session";
 import useSWRV from "swrv";
 import { loadProfile } from "@/api/profiles";
 import UserBadge from "@/components/UserBadge.vue";
@@ -181,16 +180,17 @@ import { store } from "@/store";
 import useToast from "@/components/Toast/useToast";
 import { rsvpToAllGameSessions, joinSession } from "@/api/gamesAndSessions";
 import { numberToWord } from "@/util/grammar";
+import { sessionWithGame } from "../IndexPage.vue";
 
 const { showSuccess, showError } = useToast();
 
 const props = defineProps({
   session: {
-    type: Object as PropType<GameSession>,
+    type: Object as PropType<sessionWithGame>,
     required: true,
   },
   allGameSessions: {
-    type: Object as PropType<GameSession[]>,
+    type: Object as PropType<sessionWithGame[]>,
     required: true,
   },
 });
@@ -207,7 +207,7 @@ const canRsvp = userCanRsvp({
 });
 
 const relatedSessions = computed(() =>
-  props.allGameSessions.filter((session) => session.id !== props.session.id)
+  props.allGameSessions.filter((session) => session.id !== props.session.id),
 );
 
 const otherReservableSessions = computed(() =>
@@ -217,8 +217,8 @@ const otherReservableSessions = computed(() =>
       session,
       userId: store.user?.id,
       hostId: props.session.creator_id,
-    })
-  )
+    }),
+  ),
 );
 
 const canRsvpToRelatedSessions = computed(() => {
@@ -227,7 +227,7 @@ const canRsvpToRelatedSessions = computed(() => {
 });
 
 const sessionPlacement = computed(() =>
-  props.allGameSessions.indexOf(props.session)
+  props.allGameSessions.indexOf(props.session),
 );
 
 async function rsvpToSession() {
diff --git a/src/pages/Community/MiniGameItem.vue b/src/pages/Community/MiniGameItem.vue
index 55d3652..1b971f1 100644
--- a/src/pages/Community/MiniGameItem.vue
+++ b/src/pages/Community/MiniGameItem.vue
@@ -129,17 +129,28 @@
           <ExclamationCircleIcon class="h-4 w-4 text-violet-600" />
         </div>
       </div>
-      <div
-        v-if="session.game_id.community_events"
-        class="flex gap-2 text-blue-700 bg-gray-100 p-4 rounded-md"
-      >
-        <CalendarIcon class="w-5 h-5 shrink-0" />
-        <a
-          :href="`/events/${session.game_id.community_events.id}`"
-          class="font-semibold text-sm line-clamp-2 underline decoration-dashed"
-        >
-          {{ session.game_id.community_events.title }}
-        </a>
+      <div class="text-blue-700 bg-gray-100 p-4 rounded-md flex flex-col gap-2">
+        <div class="flex gap-2">
+          <UserGroupIcon class="w-5 h-5 shrink-0" />
+          <router-link
+            :to="`/communities/${
+              session.game_id.community_id.url_short_name ||
+              session.game_id.community_id.id
+            }`"
+            class="text-sm line-clamp-2 underline decoration-dashed"
+          >
+            {{ session.game_id.community_id.name }}
+          </router-link>
+        </div>
+        <div v-if="session.game_id.community_events" class="flex gap-2">
+          <CalendarIcon class="w-5 h-5 shrink-0" />
+          <a
+            :href="`/events/${session.game_id.community_events.id}`"
+            class="text-sm line-clamp-2 underline decoration-dashed"
+          >
+            {{ session.game_id.community_events.title }}
+          </a>
+        </div>
       </div>
       <div>
         <router-link :to="`/games/${session.game_id.id}`">
@@ -225,6 +236,7 @@ import {
   EllipsisHorizontalCircleIcon,
   CheckCircleIcon,
   CalendarIcon,
+  UserGroupIcon,
 } from "@heroicons/vue/24/outline";
 import {
   ChevronRightIcon,
@@ -257,13 +269,14 @@ import {
 } from "@/api/gamesAndSessions";
 import { getCoverImageUrl } from "@/api/storage";
 import { pluralize } from "@/util/grammar";
-import { GameSession, Session } from "@/typings/Session";
+import { Session } from "@/typings/Session";
+import { sessionWithGame } from "../IndexPage.vue";
 
 const { showSuccess, showError } = useToast();
 
 const props = defineProps({
   session: {
-    type: Object as PropType<Omit<GameSession, "community_id">>,
+    type: Object as PropType<sessionWithGame>,
     required: true,
   },
   allGameSessions: {
diff --git a/src/pages/Events/EventCalendar.vue b/src/pages/Events/EventCalendar.vue
index eec5043..2ef1328 100644
--- a/src/pages/Events/EventCalendar.vue
+++ b/src/pages/Events/EventCalendar.vue
@@ -91,7 +91,9 @@
           <ListView
             :loading="loading"
             :sessions="filteredSessions"
-            :sessions-by-game="(sessionsByGame as Record<string, GameSession[]>)"
+            :sessions-by-game="
+              sessionsByGame as Record<string, sessionWithGame[]>
+            "
             :reference-date="referenceDate"
             @update-reference-date="onDateChange"
             @refresh="refreshSessions"
@@ -100,7 +102,9 @@
         <TabPanel>
           <CalendarView
             :sessions="filteredSessions"
-            :sessions-by-game="(sessionsByGame as Record<string, GameSession[]>)"
+            :sessions-by-game="
+              sessionsByGame as Record<string, sessionWithGame[]>
+            "
             :reference-date="referenceDate"
             :selected-date="selectedDate"
             @update-reference-date="onDateChange"
@@ -128,7 +132,6 @@ import {
 } from "@headlessui/vue";
 import { AdjustmentsHorizontalIcon } from "@heroicons/vue/24/outline";
 import FormLabel from "@/components/Forms/FormLabel.vue";
-import { GameSession } from "@/typings/Session";
 import {
   loadOpenEventSessions,
   loadEventSessions,
@@ -140,6 +143,7 @@ import { store } from "@/store";
 import * as R from "ramda";
 import { eventStore } from "./eventStore";
 import { useRoute, useRouter } from "vue-router";
+import { sessionWithGame } from "../IndexPage.vue";
 
 const route = useRoute();
 const router = useRouter();
@@ -170,13 +174,13 @@ const options = [
 
 const loading = ref(false);
 
-const sessions = ref<GameSession[]>([]);
+const sessions = ref<sessionWithGame[]>([]);
 const selectedDate = ref<Date>();
 const sortOption = ref(options[0]);
 
 const sessionsByGame = computed(() => {
-  const groupByGame = R.groupBy((session: GameSession) =>
-    String(session.game_id.id)
+  const groupByGame = R.groupBy((session: sessionWithGame) =>
+    String(session.game_id.id),
   );
   return groupByGame(sessions.value);
 });
@@ -188,12 +192,12 @@ const filteredSessions = computed(() => {
   let filteredSessions = sessions.value;
   if (excludeOwnGames.value) {
     filteredSessions = sessions.value.filter(
-      (session) => session.creator_id !== store.user?.id
+      (session) => session.creator_id !== store.user?.id,
     );
   }
   if (excludeRsvpdGames.value) {
     filteredSessions = filteredSessions.filter(
-      (session) => !session.rsvps.includes(store.user?.id || "")
+      (session) => !session.rsvps.includes(store.user?.id || ""),
     );
   }
   return filteredSessions;
@@ -209,7 +213,7 @@ watch(
   () => sortOption.value,
   (newVal) => {
     newVal.value();
-  }
+  },
 );
 
 async function refreshSessions() {
diff --git a/src/pages/Home/SessionName.vue b/src/pages/Home/SessionName.vue
index dc2de56..276eb08 100644
--- a/src/pages/Home/SessionName.vue
+++ b/src/pages/Home/SessionName.vue
@@ -7,17 +7,17 @@
     </router-link>
     <router-link
       :to="`/communities/${
-        session.community_id?.url_short_name || session.community_id?.id
+        session.game_id.community_id?.url_short_name ||
+        session.game_id.community_id?.id
       }`"
       class="text-sm text-brand-500 mt-1"
     >
-      {{ session.community_id?.name }}
+      {{ session.game_id.community_id?.name }}
     </router-link>
   </div>
 </template>
 <script lang="ts" setup>
 import { PropType } from "vue";
-import { format } from "date-fns";
 import { sessionWithGame } from "../IndexPage.vue";
 
 defineProps({
diff --git a/src/pages/IndexPage.vue b/src/pages/IndexPage.vue
index 76aa518..358fe2a 100644
--- a/src/pages/IndexPage.vue
+++ b/src/pages/IndexPage.vue
@@ -153,11 +153,11 @@ const showConfirmEmailBanner = ref(
 export type sessionWithGame = Omit<Session, "game_id"> & {
   game_id: Game & {
     sessions: Session[];
-  };
-  community_id: {
-    name: string;
-    id: string;
-    url_short_name?: string;
+    community_id: {
+      name: string;
+      id: string;
+      url_short_name?: string;
+    };
   };
 };
 export type sessionWithGameTitleAndId = Session & {
diff --git a/src/pages/UserDashboard.vue b/src/pages/UserDashboard.vue
index 96b2f5e..0984e21 100644
--- a/src/pages/UserDashboard.vue
+++ b/src/pages/UserDashboard.vue
@@ -36,7 +36,7 @@
                   db.playerHistory[session.creator_id].email
                 "
                 :player-history="db.playerHistory[session.creator_id]"
-                :community-id="session.community_id.id"
+                :community-id="session.game_id.community_id.id"
                 position="top"
               />
               <div class="flex flex-col gap-1">
@@ -67,7 +67,7 @@
                       db.playerHistory[rsvp].email
                     "
                     :player-history="db.playerHistory[rsvp]"
-                    :community-id="session.community_id.id"
+                    :community-id="session.game_id.community_id.id"
                     position="top"
                   />
                 </template>
@@ -120,7 +120,7 @@
                       db.playerHistory[rsvp].email
                     "
                     :player-history="db.playerHistory[rsvp]"
-                    :community-id="session.community_id.id"
+                    :community-id="session.game_id.community_id.id"
                     :position="isMdAndLarger ? 'left' : 'top'"
                     show-new-member-status
                   />
diff --git a/src/typings/supabase.ts b/src/typings/supabase.ts
index 498da04..a47a1ca 100644
--- a/src/typings/supabase.ts
+++ b/src/typings/supabase.ts
@@ -815,6 +815,7 @@ export interface Database {
           id: string
           name: string
           owner: string | null
+          owner_id: string | null
           public: boolean | null
           updated_at: string | null
         }
@@ -826,6 +827,7 @@ export interface Database {
           id: string
           name: string
           owner?: string | null
+          owner_id?: string | null
           public?: boolean | null
           updated_at?: string | null
         }
@@ -837,17 +839,11 @@ export interface Database {
           id?: string
           name?: string
           owner?: string | null
+          owner_id?: string | null
           public?: boolean | null
           updated_at?: string | null
         }
-        Relationships: [
-          {
-            foreignKeyName: "buckets_owner_fkey"
-            columns: ["owner"]
-            referencedRelation: "users"
-            referencedColumns: ["id"]
-          }
-        ]
+        Relationships: []
       }
       migrations: {
         Row: {
@@ -879,6 +875,7 @@ export interface Database {
           metadata: Json | null
           name: string | null
           owner: string | null
+          owner_id: string | null
           path_tokens: string[] | null
           updated_at: string | null
           version: string | null
@@ -891,6 +888,7 @@ export interface Database {
           metadata?: Json | null
           name?: string | null
           owner?: string | null
+          owner_id?: string | null
           path_tokens?: string[] | null
           updated_at?: string | null
           version?: string | null
@@ -903,6 +901,7 @@ export interface Database {
           metadata?: Json | null
           name?: string | null
           owner?: string | null
+          owner_id?: string | null
           path_tokens?: string[] | null
           updated_at?: string | null
           version?: string | null