diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 6e456a675..8750f8d12 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -10,7 +10,7 @@ datasource db {
 }
 
 model User {
-  id          String    @id @unique @map("user_id") @db.Uuid
+  id          String    @id() @map("user_id") @db.Uuid
   username    String    @unique @db.VarChar(255)
   password    String    @db.VarChar(60)
   role        String    @map("role") @db.VarChar(50)
@@ -32,7 +32,7 @@ model User {
 }
 
 model Session {
-  id         String    @id @unique @map("session_id") @db.Uuid
+  id         String    @id() @map("session_id") @db.Uuid
   websiteId  String    @map("website_id") @db.Uuid
   browser    String?   @db.VarChar(20)
   os         String?   @db.VarChar(20)
@@ -64,7 +64,7 @@ model Session {
 }
 
 model Website {
-  id        String    @id @unique @map("website_id") @db.Uuid
+  id        String    @id() @map("website_id") @db.Uuid
   name      String    @db.VarChar(100)
   domain    String?   @db.VarChar(500)
   resetAt   DateTime? @map("reset_at") @db.Timestamptz(6)
@@ -185,7 +185,7 @@ model SessionData {
 }
 
 model Team {
-  id         String    @id() @unique() @map("team_id") @db.Uuid
+  id         String    @id() @map("team_id") @db.Uuid
   name       String    @db.VarChar(50)
   accessCode String?   @unique @map("access_code") @db.VarChar(50)
   logoUrl    String?   @map("logo_url") @db.VarChar(2183)
@@ -197,14 +197,14 @@ model Team {
   members  TeamUser[]
   links    Link[]
   pixels   Pixel[]
-  boards   Board[]
+  boards    Board[]
 
   @@index([accessCode])
   @@map("team")
 }
 
 model TeamUser {
-  id        String    @id() @unique() @map("team_user_id") @db.Uuid
+  id        String    @id() @map("team_user_id") @db.Uuid
   teamId    String    @map("team_id") @db.Uuid
   userId    String    @map("user_id") @db.Uuid
   role      String    @db.VarChar(50)
@@ -220,7 +220,7 @@ model TeamUser {
 }
 
 model Report {
-  id          String    @id() @unique() @map("report_id") @db.Uuid
+  id          String    @id() @map("report_id") @db.Uuid
   userId      String    @map("user_id") @db.Uuid
   websiteId   String    @map("website_id") @db.Uuid
   type        String    @db.VarChar(50)
@@ -241,7 +241,7 @@ model Report {
 }
 
 model Segment {
-  id         String    @id() @unique() @map("segment_id") @db.Uuid
+  id         String    @id() @map("segment_id") @db.Uuid
   websiteId  String    @map("website_id") @db.Uuid
   type       String    @db.VarChar(50)
   name       String    @db.VarChar(200)
@@ -256,7 +256,7 @@ model Segment {
 }
 
 model Revenue {
-  id        String    @id() @unique() @map("revenue_id") @db.Uuid
+  id        String    @id() @map("revenue_id") @db.Uuid
   websiteId String    @map("website_id") @db.Uuid
   sessionId String    @map("session_id") @db.Uuid
   eventId   String    @map("event_id") @db.Uuid
@@ -276,7 +276,7 @@ model Revenue {
 }
 
 model Link {
-  id        String    @id() @unique() @map("link_id") @db.Uuid
+  id        String    @id() @map("link_id") @db.Uuid
   name      String    @db.VarChar(100)
   url       String    @db.VarChar(500)
   slug      String    @unique() @db.VarChar(100)
@@ -297,7 +297,7 @@ model Link {
 }
 
 model Pixel {
-  id        String    @id() @unique() @map("pixel_id") @db.Uuid
+  id        String    @id() @map("pixel_id") @db.Uuid
   name      String    @db.VarChar(100)
   slug      String    @unique() @db.VarChar(100)
   userId    String?   @map("user_id") @db.Uuid
@@ -317,7 +317,7 @@ model Pixel {
 }
 
 model Board {
-  id          String    @id() @unique() @map("board_id") @db.Uuid
+  id          String    @id() @map("board_id") @db.Uuid
   type        String    @db.VarChar(50)
   name        String    @db.VarChar(200)
   description String    @db.VarChar(500)
@@ -339,8 +339,9 @@ model Board {
 }
 
 model Share {
-  id         String    @id() @unique() @map("share_id") @db.Uuid
+  id         String    @id() @map("share_id") @db.Uuid
   entityId   String    @map("entity_id") @db.Uuid
+  name       String    @db.VarChar(200)
   shareType  Int       @map("share_type") @db.Integer
   slug       String    @unique() @db.VarChar(100)
   parameters Json
@@ -349,4 +350,4 @@ model Share {
 
   @@index([entityId])
   @@map("share")
-}
+}
\ No newline at end of file
diff --git a/src/app/(main)/App.tsx b/src/app/(main)/App.tsx
index 2e236db0f..eba4e264f 100644
--- a/src/app/(main)/App.tsx
+++ b/src/app/(main)/App.tsx
@@ -49,8 +49,8 @@ export function App({ children }) {
       <Column display={{ base: 'none', lg: 'flex' }}>
         <SideNav />
       </Column>
-      <Column alignItems="center" overflowY="auto" overflowX="hidden" position="relative">
-        {children}
+      <Column overflowX="hidden" position="relative">
+        <Column alignItems="center">{children}</Column>
       </Column>
       <UpdateNotice user={user} config={config} />
       {process.env.NODE_ENV === 'production' && !pathname.includes('/share/') && (
diff --git a/src/app/(main)/settings/SettingsLayout.tsx b/src/app/(main)/settings/SettingsLayout.tsx
index 0da5f8451..2492ae9ea 100644
--- a/src/app/(main)/settings/SettingsLayout.tsx
+++ b/src/app/(main)/settings/SettingsLayout.tsx
@@ -12,7 +12,7 @@ export function SettingsLayout({ children }: { children: ReactNode }) {
         width="240px"
         height="100%"
         border="right"
-        backgroundColor
+        backgroundColor={'surface-raised'}
         marginRight="2"
         padding="3"
       >
diff --git a/src/app/(main)/settings/preferences/DateRangeSetting.tsx b/src/app/(main)/settings/preferences/DateRangeSetting.tsx
index 3f5e6647f..28745aab6 100644
--- a/src/app/(main)/settings/preferences/DateRangeSetting.tsx
+++ b/src/app/(main)/settings/preferences/DateRangeSetting.tsx
@@ -21,7 +21,12 @@ export function DateRangeSetting() {
 
   return (
     <Row gap="3">
-      <DateFilter value={date} onChange={handleChange} placement="bottom start" />
+      <DateFilter
+        value={date}
+        onChange={handleChange}
+        placement="bottom start"
+        style={{ minWidth: '250px' }}
+      />
       <Button onPress={handleReset}>{formatMessage(labels.reset)}</Button>
     </Row>
   );
diff --git a/src/app/(main)/settings/preferences/LanguageSetting.tsx b/src/app/(main)/settings/preferences/LanguageSetting.tsx
index 00a2d74f0..2b2d0febe 100644
--- a/src/app/(main)/settings/preferences/LanguageSetting.tsx
+++ b/src/app/(main)/settings/preferences/LanguageSetting.tsx
@@ -34,6 +34,7 @@ export function LanguageSetting() {
         onSearch={setSearch}
         onOpenChange={handleOpen}
         listProps={{ style: { maxHeight: 300 } }}
+        style={{ minWidth: '250px' }}
       >
         {items.map(item => (
           <ListItem key={item} id={item}>
diff --git a/src/app/(main)/settings/preferences/PreferenceSettings.tsx b/src/app/(main)/settings/preferences/PreferenceSettings.tsx
index cc2d1b620..c91a6eff2 100644
--- a/src/app/(main)/settings/preferences/PreferenceSettings.tsx
+++ b/src/app/(main)/settings/preferences/PreferenceSettings.tsx
@@ -15,7 +15,7 @@ export function PreferenceSettings() {
   }
 
   return (
-    <Column width="400px" gap="6">
+    <Column gap="6">
       <Column>
         <Label>{formatMessage(labels.defaultDateRange)}</Label>
         <DateRangeSetting />
diff --git a/src/app/(main)/settings/preferences/TimezoneSetting.tsx b/src/app/(main)/settings/preferences/TimezoneSetting.tsx
index cf20b20da..8551e8cf0 100644
--- a/src/app/(main)/settings/preferences/TimezoneSetting.tsx
+++ b/src/app/(main)/settings/preferences/TimezoneSetting.tsx
@@ -30,6 +30,7 @@ export function TimezoneSetting() {
         onSearch={setSearch}
         onOpenChange={handleOpen}
         listProps={{ style: { maxHeight: 300 } }}
+        style={{ minWidth: '250px' }}
       >
         {items.map((item: any) => (
           <ListItem key={item} id={item}>
diff --git a/src/app/(main)/settings/profile/ProfileSettings.tsx b/src/app/(main)/settings/profile/ProfileSettings.tsx
index fae73a53f..d53a68a03 100644
--- a/src/app/(main)/settings/profile/ProfileSettings.tsx
+++ b/src/app/(main)/settings/profile/ProfileSettings.tsx
@@ -29,7 +29,7 @@ export function ProfileSettings() {
   };
 
   return (
-    <Column width="400px" gap="6">
+    <Column gap="6">
       <Column>
         <Label>{formatMessage(labels.username)}</Label>
         {username}
diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionActivity.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionActivity.tsx
index a93885aa9..162279d96 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/SessionActivity.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionActivity.tsx
@@ -61,7 +61,7 @@ export function SessionActivity({
 
           return (
             <Column key={eventId} gap>
-              {showHeader && <Heading size="sm">{formatTimezoneDate(createdAt, 'PPPP')}</Heading>}
+              {showHeader && <Heading size="lg">{formatTimezoneDate(createdAt, 'PPPP')}</Heading>}
               <Row alignItems="center" gap="6" height="40px">
                 <StatusLight color={`#${visitId?.substring(0, 6)}`}>
                   <Text wrap="nowrap">{formatTimezoneDate(createdAt, 'pp')}</Text>
diff --git a/src/app/global.css b/src/app/global.css
index c647726f6..0df4185fc 100644
--- a/src/app/global.css
+++ b/src/app/global.css
@@ -24,3 +24,41 @@ a:hover {
   color: var(--text-primary);
   text-decoration: none;
 }
+
+::-webkit-scrollbar {
+  width: 15px;
+  background: transparent;
+}
+
+::-webkit-scrollbar-track {
+  border: 7px solid rgba(0, 0, 0, 0);
+  background-color: var(--border-default);
+  background-clip: padding-box;
+}
+
+::-webkit-scrollbar-thumb {
+  border: 7px solid rgba(0, 0, 0, 0);
+  background-color: var(--text-disabled);
+  border-radius: var(--border-radius-full);
+  background-clip: padding-box;
+}
+
+::-webkit-scrollbar-thumb:hover {
+  border: 4px solid rgba(0, 0, 0, 0);
+  background-clip: padding-box;
+}
+
+/* Fix autofill background color to match dark theme */
+input:-webkit-autofill,
+input:-webkit-autofill:hover,
+input:-webkit-autofill:focus,
+input:-webkit-autofill:active,
+textarea:-webkit-autofill,
+textarea:-webkit-autofill:hover,
+textarea:-webkit-autofill:focus,
+select:-webkit-autofill,
+select:-webkit-autofill:hover,
+select:-webkit-autofill:focus {
+  -webkit-box-shadow: 0 0 0 1000px var(--background-color) inset !important;
+  transition: color 5000s ease-in-out 0s;
+}
diff --git a/src/app/login/LoginPage.tsx b/src/app/login/LoginPage.tsx
index 8b90c8f33..7bb2e35fc 100644
--- a/src/app/login/LoginPage.tsx
+++ b/src/app/login/LoginPage.tsx
@@ -4,7 +4,13 @@ import { LoginForm } from './LoginForm';
 
 export function LoginPage() {
   return (
-    <Column alignItems="center" height="100vh" backgroundColor="surface-raised" paddingTop="12">
+    <Column
+      alignItems="center"
+      justifyContent="flex-start"
+      height="100vh"
+      backgroundColor="surface-raised"
+      style={{ paddingTop: '15vh' }}
+    >
       <LoginForm />
     </Column>
   );
diff --git a/src/components/common/NavMenu.tsx b/src/components/common/NavMenu.tsx
index 8f5f599b3..3035db992 100644
--- a/src/components/common/NavMenu.tsx
+++ b/src/components/common/NavMenu.tsx
@@ -55,7 +55,7 @@ export function NavMenu({
     <Column gap overflowY="auto" justifyContent="space-between" position="sticky">
       {title && (
         <Row padding>
-          <Heading size="sm">{title}</Heading>
+          <Heading size="lg">{title}</Heading>
         </Row>
       )}
       <Column gap="6" {...props}>
diff --git a/src/components/metrics/WeeklyTraffic.tsx b/src/components/metrics/WeeklyTraffic.tsx
index 323990c5f..b62a9d719 100644
--- a/src/components/metrics/WeeklyTraffic.tsx
+++ b/src/components/metrics/WeeklyTraffic.tsx
@@ -96,7 +96,7 @@ export function WeeklyTraffic({ websiteId }: { websiteId: string }) {
                           </Row>
                         </Focusable>
                         <Tooltip placement="right">
-                          <Text size="sm">{`${formatMessage(labels.visitors)}: ${count}`}</Text>
+                          <Text size="base">{`${formatMessage(labels.visitors)}: ${count}`}</Text>
                         </Tooltip>
                       </TooltipTrigger>
                     );