diff --git a/src/components/sections/Schedule.tsx b/src/components/sections/Schedule.tsx
index 560ea3a..d1b7751 100644
--- a/src/components/sections/Schedule.tsx
+++ b/src/components/sections/Schedule.tsx
@@ -40,7 +40,7 @@ type ScheduleAction =
 
 const initialState: ScheduleState = {
   locationMode: "all",
-  viewMode: "days",
+  viewMode: "groups",
   filterTrainer: null,
   filterType: null,
   filterStatus: "all",
diff --git a/src/components/sections/schedule/DayCard.tsx b/src/components/sections/schedule/DayCard.tsx
index 670cb15..9918b1b 100644
--- a/src/components/sections/schedule/DayCard.tsx
+++ b/src/components/sections/schedule/DayCard.tsx
@@ -115,10 +115,10 @@ export function DayCard({ day, typeDots, showLocation, filterTrainer, setFilterT
             <div key={locName}>
               {/* Location sub-header */}
               <div className={`flex items-center gap-1.5 px-5 py-2 bg-neutral-100/60 dark:bg-white/[0.03] ${gi > 0 ? "border-t border-neutral-200 dark:border-white/[0.06]" : ""}`}>
-                <MapPin size={11} className="shrink-0 text-neutral-400 dark:text-white/25" />
-                <span className="text-[11px] font-medium text-neutral-400 dark:text-white/30">
+                <MapPin size={11} className="shrink-0 text-gold/60" />
+                <span className="text-[11px] font-medium text-neutral-600 dark:text-white/50">
                   {locName}
-                  {address && <span className="text-neutral-300 dark:text-white/15"> · {shortAddress(address)}</span>}
+                  {address && <span className="text-neutral-400 dark:text-white/30"> · {shortAddress(address)}</span>}
                 </span>
               </div>
               <div className="divide-y divide-neutral-100 dark:divide-white/[0.04]">
diff --git a/src/components/sections/schedule/GroupView.tsx b/src/components/sections/schedule/GroupView.tsx
index 4a460a3..9acc598 100644
--- a/src/components/sections/schedule/GroupView.tsx
+++ b/src/components/sections/schedule/GroupView.tsx
@@ -239,9 +239,9 @@ export function GroupView({
 
                             {/* Location */}
                             {showLocation && group.location && (
-                              <span className="flex items-center gap-1 text-[10px] text-neutral-400 dark:text-white/25">
+                              <span className="flex items-center gap-1 rounded-full bg-white/5 border border-white/10 px-2 py-px text-[10px] font-medium text-neutral-300 dark:text-white/50">
                                 <MapPin size={9} />
-                                {group.location}
+                                {shortAddress(group.locationAddress || group.location)}
                               </span>
                             )}