diff --git a/app/api/listings/[id]/availability/route.ts b/app/api/listings/[id]/availability/route.ts
index 90a6539..366b696 100644
--- a/app/api/listings/[id]/availability/route.ts
+++ b/app/api/listings/[id]/availability/route.ts
@@ -5,12 +5,12 @@ import { expandBlockedDates, getCalendarRanges } from '../../../../../lib/calend
 export async function GET(_: Request, { params }: { params: { id: string } }) {
   const monthParam = Number(new URL(_.url).searchParams.get('month') ?? new Date().getUTCMonth());
   const yearParam = Number(new URL(_.url).searchParams.get('year') ?? new Date().getUTCFullYear());
-  const monthsParam = Math.min(Number(new URL(_.url).searchParams.get('months') ?? 2), 12);
+  const monthsParam = Math.min(Number(new URL(_.url).searchParams.get('months') ?? 1), 12);
   const forceRefresh = new URL(_.url).searchParams.get('refresh') === '1';
 
   const month = Number.isFinite(monthParam) ? monthParam : new Date().getUTCMonth();
   const year = Number.isFinite(yearParam) ? yearParam : new Date().getUTCFullYear();
-  const months = Number.isFinite(monthsParam) && monthsParam > 0 ? monthsParam : 2;
+  const months = Number.isFinite(monthsParam) && monthsParam > 0 ? monthsParam : 1;
 
   const listing = await prisma.listing.findUnique({ where: { id: params.id }, select: { calendarUrls: true } });
   if (!listing) {
diff --git a/app/components/AvailabilityCalendar.tsx b/app/components/AvailabilityCalendar.tsx
index 9a151c4..856eecf 100644
--- a/app/components/AvailabilityCalendar.tsx
+++ b/app/components/AvailabilityCalendar.tsx
@@ -41,16 +41,17 @@ function buildMonths(monthCount: number, blocked: Set<string>, startYear: number
 
 type AvailabilityResponse = { blockedDates: string[] };
 
-export default function AvailabilityCalendar({ listingId, hasCalendar, months = 2 }: { listingId: string; hasCalendar: boolean; months?: number }) {
-  const { t } = useI18n();
+export default function AvailabilityCalendar({ listingId, hasCalendar }: { listingId: string; hasCalendar: boolean }) {
+  const { t, locale } = useI18n();
   const today = useMemo(() => new Date(), []);
   const [month, setMonth] = useState<number>(today.getUTCMonth());
   const [year, setYear] = useState<number>(today.getUTCFullYear());
   const [blockedDates, setBlockedDates] = useState<string[]>([]);
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState<string | null>(null);
+  const monthCount = 1;
   const blockedSet = useMemo(() => new Set(blockedDates), [blockedDates]);
-  const monthViews = useMemo(() => buildMonths(months, blockedSet, year, month), [months, blockedSet, year, month]);
+  const monthViews = useMemo(() => buildMonths(monthCount, blockedSet, year, month), [monthCount, blockedSet, year, month]);
 
   useEffect(() => {
     if (!hasCalendar) return;
@@ -60,7 +61,7 @@ export default function AvailabilityCalendar({ listingId, hasCalendar, months =
     const params = new URLSearchParams({
       month: String(month),
       year: String(year),
-      months: String(months),
+      months: String(monthCount),
       refresh: '1',
     });
     fetch(`/api/listings/${listingId}/availability?${params.toString()}`, { cache: 'no-store', signal: controller.signal })
@@ -79,7 +80,7 @@ export default function AvailabilityCalendar({ listingId, hasCalendar, months =
       .finally(() => setLoading(false));
 
     return () => controller.abort();
-  }, [listingId, hasCalendar, month, year, months]);
+  }, [listingId, hasCalendar, month, year, monthCount]);
 
   function shiftMonth(delta: number) {
     const next = new Date(Date.UTC(year, month, 1));
@@ -92,9 +93,9 @@ export default function AvailabilityCalendar({ listingId, hasCalendar, months =
     () =>
       Array.from({ length: 12 }, (_, m) => ({
         value: m,
-        label: new Date(Date.UTC(2020, m, 1)).toLocaleString(undefined, { month: 'long' }),
+        label: new Date(Date.UTC(2020, m, 1)).toLocaleString(locale, { month: 'long' }),
       })),
-    [],
+    [locale],
   );
   const yearOptions = useMemo(() => {
     const current = today.getUTCFullYear();
@@ -106,71 +107,70 @@ export default function AvailabilityCalendar({ listingId, hasCalendar, months =
       <div style={{ display: 'flex', gap: 10, alignItems: 'center', flexWrap: 'wrap' }}>
         <div style={{ display: 'flex', gap: 8, alignItems: 'center', flexWrap: 'wrap' }}>
           <span style={{ fontWeight: 700 }}>{t('availabilityTitle')}</span>
-          <span className="badge secondary">{t('availabilityLegendBooked')}</span>
         </div>
         <div style={{ marginLeft: 'auto', display: 'flex', alignItems: 'center', gap: 6, flexWrap: 'wrap' }}>
+          <span className="badge secondary">{t('availabilityLegendBooked')}</span>
           <button type="button" className="button secondary" onClick={() => shiftMonth(-1)} disabled={!hasCalendar || loading} style={{ padding: '6px 10px' }}>
             ←
           </button>
-          <select value={month} onChange={(e) => setMonth(Number(e.target.value))} disabled={!hasCalendar || loading}>
-            {monthOptions.map((opt) => (
-              <option key={opt.value} value={opt.value}>
-                {opt.label}
-              </option>
-            ))}
-          </select>
-          <select value={year} onChange={(e) => setYear(Number(e.target.value))} disabled={!hasCalendar || loading}>
-            {yearOptions.map((y) => (
-              <option key={y} value={y}>
-                {y}
-              </option>
-            ))}
-          </select>
           <button type="button" className="button secondary" onClick={() => shiftMonth(1)} disabled={!hasCalendar || loading} style={{ padding: '6px 10px' }}>
             →
           </button>
         </div>
       </div>
       {error ? <div style={{ color: '#f87171', fontSize: 13 }}>{error}</div> : null}
-      <div style={{ display: 'grid', gap: 12, gridTemplateColumns: `repeat(${months}, minmax(180px, 1fr))` }}>
-        {monthViews.map((month) => (
-          <div key={month.label} className="panel" style={{ padding: 12 }}>
-            <div style={{ fontWeight: 600, marginBottom: 8 }}>{month.label}</div>
-            <div
-              style={{
-                display: 'grid',
-                gridTemplateColumns: 'repeat(7, 1fr)',
-                gap: 6,
-                fontSize: 12,
-                textAlign: 'center',
-              }}
-            >
-              {['S', 'M', 'T', 'W', 'T', 'F', 'S'].map((d) => (
-                <div key={d} style={{ color: '#94a3b8', fontWeight: 600 }}>
-                  {d}
-                </div>
+      {monthViews.map((monthView) => (
+        <div key={monthView.label} className="panel" style={{ padding: 12 }}>
+          <div style={{ display: 'flex', gap: 8, alignItems: 'center', marginBottom: 8 }}>
+            <select value={month} onChange={(e) => setMonth(Number(e.target.value))} disabled={!hasCalendar || loading} style={{ flex: 1 }}>
+              {monthOptions.map((opt) => (
+                <option key={opt.value} value={opt.value}>
+                  {opt.label}
+                </option>
               ))}
-              {month.days.map((day, idx) => (
-                <div
-                  key={`${month.label}-${idx}`}
-                  style={{
-                    height: 32,
-                    borderRadius: 8,
-                    background: day.isFiller ? 'transparent' : day.blocked ? 'rgba(248,113,113,0.2)' : 'rgba(148,163,184,0.1)',
-                    color: day.isFiller ? 'transparent' : day.blocked ? '#ef4444' : '#e2e8f0',
-                    display: 'flex',
-                    alignItems: 'center',
-                    justifyContent: 'center',
-                  }}
-                  aria-label={day.date ? `${day.date}${day.blocked ? ' (booked)' : ''}` : undefined}
-                >
-                  {day.label}
-                </div>
+            </select>
+            <select value={year} onChange={(e) => setYear(Number(e.target.value))} disabled={!hasCalendar || loading} style={{ width: 96 }}>
+              {yearOptions.map((y) => (
+                <option key={y} value={y}>
+                  {y}
+                </option>
               ))}
-            </div>
+            </select>
           </div>
-        ))}
-      </div>
+          <div
+            style={{
+              display: 'grid',
+              gridTemplateColumns: 'repeat(7, 1fr)',
+              gap: 6,
+              fontSize: 12,
+              textAlign: 'center',
+            }}
+          >
+            {['S', 'M', 'T', 'W', 'T', 'F', 'S'].map((d) => (
+              <div key={d} style={{ color: '#94a3b8', fontWeight: 600 }}>
+                {d}
+              </div>
+            ))}
+            {monthView.days.map((day, idx) => (
+              <div
+                key={`${monthView.label}-${idx}`}
+                style={{
+                  height: 32,
+                  borderRadius: 8,
+                  background: day.isFiller ? 'transparent' : day.blocked ? 'rgba(248,113,113,0.2)' : 'rgba(148,163,184,0.1)',
+                  color: day.isFiller ? 'transparent' : day.blocked ? '#ef4444' : '#e2e8f0',
+                  display: 'flex',
+                  alignItems: 'center',
+                  justifyContent: 'center',
+                }}
+                aria-label={day.date ? `${day.date}${day.blocked ? ' (booked)' : ''}` : undefined}
+              >
+                {day.label}
+              </div>
+            ))}
+          </div>
+        </div>
+      ))}
     </div>
   );
 }