diff --git a/public/css/mobile.css b/public/css/mobile.css
index d5f9c4f..53b9032 100644
--- a/public/css/mobile.css
+++ b/public/css/mobile.css
@@ -13,6 +13,7 @@
 .mobile-add-bar      { display: none; }
 .mobile-section-head { display: none; }
 .m-tab-pill          { display: none; }
+.m-search-input      { display: none; }
 
 /* ═══════════════════════════════════════════════════ */
 @media (max-width: 880px) {
@@ -24,6 +25,37 @@
     .add-bar          { display: none !important; }
     .footnote         { display: none !important; }
 
+    /* Hide desktop search card on mobile (mobile has .m-search-input instead) */
+    .card-section     { display: none; }
+
+    /* ── Mobile course search input ─────────────────── */
+
+    .m-search-input {
+        display: block;
+        width: 100%;
+        height: 38px;
+        padding: 0 12px;
+        background: var(--paper-2);
+        border: 1px solid var(--line-2);
+        border-radius: 10px;
+        font-family: var(--font-sans);
+        font-size: 14px;
+        color: var(--ink);
+        outline: none;
+        box-sizing: border-box;
+        transition: border-color 150ms ease, box-shadow 150ms ease;
+    }
+
+    .m-search-input::placeholder {
+        color: var(--ink-3);
+        opacity: 0.7;
+    }
+
+    .m-search-input:focus {
+        border-color: var(--accent);
+        box-shadow: 0 0 0 3px color-mix(in oklab, var(--accent) 14%, transparent);
+    }
+
     /* Hide desktop table but keep .table-card as wrapper */
     .table-card > #ratings-table table,
     #ratings-table table,
diff --git a/public/css/players.css b/public/css/players.css
index 635d7b3..ac98cae 100644
--- a/public/css/players.css
+++ b/public/css/players.css
@@ -10,16 +10,6 @@
     display: none;
 }
 
-@media (max-width: 768px) {
-    .mobile-only {
-        display: block;
-    }
-
-    .player-name {
-        font-weight: 600;
-    }
-}
-
 /* ── Rating values ────────────────────────────── */
 
 .rating-value {
@@ -286,19 +276,6 @@
     background: #059669;
 }
 
-/* ── Responsive ───────────────────────────────── */
-
-@media (max-width: 768px) {
-    .chart-container {
-        height: 250px;
-        margin: 5px 0;
-    }
-
-    .chart-title {
-        font-size: 13px;
-    }
-}
-
 /* ── Target Rating Calculator ─────────────────── */
 
 .target-rating-icon {
diff --git a/public/js/courses.js b/public/js/courses.js
index 566d25b..2f692c9 100644
--- a/public/js/courses.js
+++ b/public/js/courses.js
@@ -31,32 +31,37 @@ function toggleCourseLayouts(courseId) {
 }
 
 // ── Mobile course card toggle ──────────────────────
-var openMobileCourseId = null;
+let openMobileCourseId = null;
 
 function toggleMobileCourseLayouts(courseId) {
-    var card = document.getElementById('m-course-' + courseId);
+    const card = document.getElementById('m-course-' + courseId);
     if (!card) return;
 
-    var isOpen = card.classList.contains('is-open');
+    const isOpen = card.classList.contains('is-open');
 
     // Close previously open card
     if (openMobileCourseId !== null && openMobileCourseId !== courseId) {
-        var prevCard = document.getElementById('m-course-' + openMobileCourseId);
-        if (prevCard) prevCard.classList.remove('is-open');
+        const prevCard = document.getElementById('m-course-' + openMobileCourseId);
+        if (prevCard) {
+            prevCard.classList.remove('is-open');
+            prevCard.setAttribute('aria-expanded', 'false');
+        }
         openMobileCourseId = null;
     }
 
     if (isOpen) {
         card.classList.remove('is-open');
+        card.setAttribute('aria-expanded', 'false');
         openMobileCourseId = null;
         return;
     }
 
     card.classList.add('is-open');
+    card.setAttribute('aria-expanded', 'true');
     openMobileCourseId = courseId;
 
     // Lazy-load layouts on first expand
-    var container = document.getElementById('m-layouts-container-' + courseId);
+    const container = document.getElementById('m-layouts-container-' + courseId);
     if (container && container.dataset.loaded !== 'true') {
         htmx.ajax('GET', '/partials/course-layouts/' + courseId, { target: '#m-layouts-container-' + courseId, swap: 'innerHTML' });
         container.dataset.loaded = 'true';
diff --git a/public/js/players.js b/public/js/players.js
index dff8c10..ac65cbd 100644
--- a/public/js/players.js
+++ b/public/js/players.js
@@ -31,8 +31,8 @@ function initChartsIn(rootEl) {
         if (container.dataset.charted === 'true') return;
         if (!container.dataset.history) return;
         try {
-            var history = JSON.parse(container.dataset.history);
-            var isMobile = container.dataset.variant === 'mobile';
+            const history = JSON.parse(container.dataset.history);
+            const isMobile = container.dataset.variant === 'mobile';
             if (isMobile) {
                 createRatingChart(container, history, {
                     w: 360,
@@ -782,32 +782,37 @@ async function refreshHistoryThenCalculate(pdgaNumber) {
 }
 
 // ── Mobile player card toggle ──────────────────────
-var openMobilePdgaNumber = null;
+let openMobilePdgaNumber = null;
 
 function toggleMobilePlayerCard(pdgaNumber) {
-    var card = document.getElementById('m-card-' + pdgaNumber);
+    const card = document.getElementById('m-card-' + pdgaNumber);
     if (!card) return;
 
-    var isOpen = card.classList.contains('is-open');
+    const isOpen = card.classList.contains('is-open');
 
     // Close previously open card
     if (openMobilePdgaNumber !== null && openMobilePdgaNumber !== pdgaNumber) {
-        var prevCard = document.getElementById('m-card-' + openMobilePdgaNumber);
-        if (prevCard) prevCard.classList.remove('is-open');
+        const prevCard = document.getElementById('m-card-' + openMobilePdgaNumber);
+        if (prevCard) {
+            prevCard.classList.remove('is-open');
+            prevCard.setAttribute('aria-expanded', 'false');
+        }
         openMobilePdgaNumber = null;
     }
 
     if (isOpen) {
         card.classList.remove('is-open');
+        card.setAttribute('aria-expanded', 'false');
         openMobilePdgaNumber = null;
         return;
     }
 
     card.classList.add('is-open');
+    card.setAttribute('aria-expanded', 'true');
     openMobilePdgaNumber = pdgaNumber;
 
     // Init charts inside the expand panel
-    var expand = card.querySelector('.m-card__expand');
+    const expand = card.querySelector('.m-card__expand');
     if (expand) {
         initChartsIn(expand);
     }
@@ -816,20 +821,20 @@ function toggleMobilePlayerCard(pdgaNumber) {
 // ── Mobile add player ──────────────────────────────
 async function searchAndAddPlayerMobile(event) {
     if (event) event.preventDefault();
-    var input = document.getElementById('pdga-number-input-mobile');
-    var pdgaNumber = input ? input.value.trim() : '';
+    const input = document.getElementById('pdga-number-input-mobile');
+    const pdgaNumber = input ? input.value.trim() : '';
 
     if (!pdgaNumber) {
         alert('Please enter a PDGA number');
         return;
     }
 
-    var button = event && event.target ? event.target.querySelector('button[type="submit"]') : null;
+    const button = event && event.target ? event.target.querySelector('button[type="submit"]') : null;
     if (button) { button.disabled = true; button.textContent = 'Searching...'; }
 
     try {
-        var response = await fetch('/api/search-player/' + pdgaNumber);
-        var data = await response.json();
+        const response = await fetch('/api/search-player/' + pdgaNumber);
+        const data = await response.json();
 
         if (!response.ok) {
             showErrorModal(data.error || 'Player not found');
diff --git a/views/pages/courses.ejs b/views/pages/courses.ejs
index 9f93f00..8b94723 100644
--- a/views/pages/courses.ejs
+++ b/views/pages/courses.ejs
@@ -25,6 +25,18 @@
             <button class="m-tab-pill__btn m-tab-pill__btn--disabled" type="button" disabled>Import from Tjing</button>
         </div>
 
+        <!-- Mobile search input (hidden on desktop, shown on mobile via CSS) -->
+        <input
+            type="text"
+            class="m-search-input"
+            id="course-search-mobile"
+            name="q"
+            placeholder="Search courses by name or city..."
+            hx-get="/partials/course-table"
+            hx-trigger="input changed delay:300ms, search"
+            hx-target="#courses-table"
+        />
+
         <div id="courses-table" hx-get="/partials/course-table" hx-trigger="load"></div>
 `; %>
 
diff --git a/views/partials/course-cards.ejs b/views/partials/course-cards.ejs
index ab372f9..70e0e87 100644
--- a/views/partials/course-cards.ejs
+++ b/views/partials/course-cards.ejs
@@ -3,27 +3,25 @@ var _query = (typeof query !== 'undefined') ? query : null;
 var _total = (typeof total !== 'undefined') ? total : courses.length;
 %>
 
+<% if (courses.length === 0) { %>
+    <p style="text-align: center; color: var(--ink-3); padding: 40px 0;">No courses found.</p>
+<% } else { %>
 <div class="mobile-section-head">
     <span class="kicker">Showing <%= courses.length %> of <%= _total %></span>
     <a href="/courses">View all &rarr;</a>
 </div>
-
-<% if (courses.length === 0) { %>
-    <p style="text-align: center; color: var(--ink-3); padding: 40px 0;">No courses found.</p>
-<% } else { %>
 <div class="mobile-list">
     <% courses.forEach(function(course) {
         var lastUpdated = new Date(course.last_updated).toLocaleDateString('en-US', { year: 'numeric', month: 'short', day: 'numeric' });
-        var layoutCount = course.layoutCount || 0;
     %>
-    <div class="m-course-card" id="m-course-<%= course.id %>" onclick="toggleMobileCourseLayouts(<%= course.id %>)">
+    <div class="m-course-card" id="m-course-<%= course.id %>"
+         tabindex="0" role="button" aria-expanded="false" aria-label="Expand course details"
+         onclick="toggleMobileCourseLayouts(<%= course.id %>)"
+         onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleMobileCourseLayouts(<%= course.id %>);}">
         <div class="m-course-card__head">
             <div class="m-course-card__name-stack">
                 <div class="m-course-name-row">
                     <span class="m-course-name"><%= course.name %></span>
-                    <% if (layoutCount > 0) { %>
-                    <span class="m-layouts-pill"><%= layoutCount %> layout<%= layoutCount !== 1 ? 's' : '' %></span>
-                    <% } %>
                 </div>
                 <div class="m-course-card__meta"><%= course.city %> &middot; <%= lastUpdated %></div>
             </div>
diff --git a/views/partials/ratings-cards.ejs b/views/partials/ratings-cards.ejs
index 2bebfff..6e72ef0 100644
--- a/views/partials/ratings-cards.ejs
+++ b/views/partials/ratings-cards.ejs
@@ -32,14 +32,13 @@ function renderSparkline(values, opts) {
 }
 %>
 
+<% if (ratings.length === 0) { %>
+    <p style="text-align: center; color: var(--ink-3); padding: 40px 0;">No players tracked yet.</p>
+<% } else { %>
 <div class="mobile-section-head">
     <span class="kicker">TRACKED PLAYERS &middot; <%= ratings.length %></span>
     <button id="trendchart-toggle-mobile" class="pill-button" type="button" aria-pressed="false">Trend chart</button>
 </div>
-
-<% if (ratings.length === 0) { %>
-    <p style="text-align: center; color: var(--ink-3); padding: 40px 0;">No players tracked yet.</p>
-<% } else { %>
 <div class="mobile-list">
     <% ratings.forEach(function(player, index) {
         var sparkSvg = renderSparkline(player.monthlyHistory || [], { w: 70, h: 26 });
@@ -56,7 +55,10 @@ function renderSparkline(values, opts) {
         var predGlyph = (predIsNull || player.deltaPredicted === 0) ? '–' : (player.deltaPredicted > 0 ? '▲' : '▼');
         var predNum = predIsNull ? '—' : (player.deltaPredicted > 0 ? '+' + player.deltaPredicted : String(player.deltaPredicted));
     %>
-    <div class="m-card" id="m-card-<%= player.pdgaNumber %>" onclick="toggleMobilePlayerCard(<%= player.pdgaNumber %>)">
+    <div class="m-card" id="m-card-<%= player.pdgaNumber %>"
+         tabindex="0" role="button" aria-expanded="false" aria-label="Expand player details"
+         onclick="toggleMobilePlayerCard(<%= player.pdgaNumber %>)"
+         onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleMobilePlayerCard(<%= player.pdgaNumber %>);}">
         <div class="m-card__head">
             <div class="m-rank-chip<%= isFirst ? ' m-rank-chip--first' : '' %>"><%= rank %></div>
             <div class="m-card__name-stack">
@@ -88,7 +90,7 @@ function renderSparkline(values, opts) {
             <% if (player.ratingHistory && player.ratingHistory.length > 0) { %>
             <div class="player-chart m-chart"
                  data-variant="mobile"
-                 data-history='<%- JSON.stringify(player.ratingHistory) %>'>
+                 data-history="<%= JSON.stringify(player.ratingHistory) %>">
             </div>
             <% } %>
             <dl class="m-detail-grid">