diff --git a/frontend/src/App.module.css b/frontend/src/App.module.css
index 4b91282..a7346a7 100644
--- a/frontend/src/App.module.css
+++ b/frontend/src/App.module.css
@@ -85,8 +85,8 @@
   font-size: 16px;
   cursor: pointer;
   transition: background 0.15s, transform 0.1s;
-  margin-left: 6px;
   flex-shrink: 0;
+  color: var(--gold);
 }
 .themeToggle:hover { background: var(--primary-dim); }
 .themeToggle:active { transform: scale(0.92); }
@@ -106,19 +106,26 @@
   }
 }
 
-/* Hide header nav on mobile */
+/* Header actions — always visible (theme toggle + admin) */
+.headerActions {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+}
+
+/* Hide header nav on mobile, keep actions */
 @media (max-width: 767px) {
   .nav {
     display: none;
   }
 }
 
-/* Admin link: icon only, subtle */
+/* Admin link: icon only */
 .adminLink {
   display: flex;
   align-items: center;
   padding: 4px;
-  color: var(--text-muted);
+  color: var(--text-secondary);
   text-decoration: none;
   transition: color 0.2s;
 }
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index cfb7329..7b0c536 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -93,6 +93,8 @@ export default function App() {
             <NavLink to="/profil" className={({ isActive }) => isActive ? styles.navLinkActive : styles.navLink}>
               Mein Profil
             </NavLink>
+          </nav>
+          <div className={styles.headerActions}>
             <NavLink to="/admin" className={styles.adminLink} title="Admin">
               <Settings size={16} />
             </NavLink>
@@ -104,7 +106,7 @@ export default function App() {
             >
               {theme === 'dark' ? <Sun size={16} /> : <Moon size={16} />}
             </button>
-          </nav>
+          </div>
         </div>
       </header>
 
diff --git a/frontend/src/components/MatchCard.module.css b/frontend/src/components/MatchCard.module.css
index 923eac3..5bf3526 100644
--- a/frontend/src/components/MatchCard.module.css
+++ b/frontend/src/components/MatchCard.module.css
@@ -21,14 +21,21 @@
     inset 0 1px 0 rgba(255,255,255,0.07) !important;
 }
 
-/* Top row — badges inset to align near flag inner edges */
-.topRow {
+/* Badge columns — vertically centered to flags */
+.badgeLeft, .badgeRight {
   display: flex;
   align-items: center;
-  gap: 8px;
-  margin-bottom: 12px;
-  margin-left: 8px;
-  margin-right: 8px;
+  align-self: flex-start;
+  height: 56px; /* match flag height */
+  min-width: 0;
+}
+
+.badgeLeft {
+  justify-content: flex-start;
+}
+
+.badgeRight {
+  justify-content: flex-end;
 }
 
 .status {
@@ -116,12 +123,12 @@
     0 0 16px rgba(254, 174, 50, 0.25);
 }
 
-/* Match row — Teams + Score/Time */
-.matchRow {
+/* Match block — badges + teams + time/score */
+.matchBlock {
   display: flex;
   align-items: flex-start;
   justify-content: center;
-  gap: 10px;
+  gap: 6px;
   margin-bottom: 16px;
 }
 
diff --git a/frontend/src/components/MatchCard.tsx b/frontend/src/components/MatchCard.tsx
index 811b838..d4ed19f 100644
--- a/frontend/src/components/MatchCard.tsx
+++ b/frontend/src/components/MatchCard.tsx
@@ -84,41 +84,18 @@ export default function MatchCard({ match, onTip }: Props) {
   return (
     <div className={`card ${styles.card} ${styles[`card_${state}`]} ${isLive ? styles.live : ''} ${glowClass}`}>
 
-      {/* Top row: Group left + Status/Countdown right */}
-      <div className={styles.topRow}>
-        {match.group && (
-          <span className={styles.group}>
-            {match.group.replace('GROUP_', 'Gruppe ')}
-          </span>
-        )}
-        <span style={{ flex: 1 }} />
-        {isLive && (
-          <span className={styles.liveBadge}>
-            <span className={styles.liveDot} />
-            LIVE
-          </span>
-        )}
-        {isFinished && (
-          <span className={styles.finishedBadge}>{STATUS_LABELS[match.status] ?? match.status}</span>
-        )}
-        {(state === 'open' || state === 'tipped') && match.tippable && (
-          <span className={`${styles.countdownBadge} ${remainingMins < 60 ? styles.countdownUrgent : ''}`}>
-            {match.minutesUntilKickoff < 60
-              ? `Noch ${remainingMins} Min!`
-              : (() => {
-                  const h = Math.floor(match.minutesUntilKickoff / 60);
-                  if (h < 24) return `in ${h}h`;
-                  const d = Math.floor(h / 24);
-                  return `in ${d} Tag${d > 1 ? 'en' : ''}`;
-                })()
-            }
-          </span>
-        )}
-      </div>
+      {/* Main layout: badges + teams + time/score in one block */}
+      <div className={styles.matchBlock}>
+        {/* Left badge — group */}
+        <div className={styles.badgeLeft}>
+          {match.group && (
+            <span className={styles.group}>
+              {match.group.replace('GROUP_', 'Gr. ')}
+            </span>
+          )}
+        </div>
 
-      {/* Teams + Center (time or score) */}
-      <div className={styles.matchRow}>
-        {/* Home */}
+        {/* Home team */}
         <div className={styles.teamHome}>
           <FlagBox crest={match.homeTeam.crest} name={match.homeTeam.name} />
           <span className={styles.teamName}>{match.homeTeam.shortName}</span>
@@ -135,11 +112,37 @@ export default function MatchCard({ match, onTip }: Props) {
           )}
         </div>
 
-        {/* Away */}
+        {/* Away team */}
         <div className={styles.teamAway}>
           <FlagBox crest={match.awayTeam.crest} name={match.awayTeam.name} />
           <span className={styles.teamName}>{match.awayTeam.shortName}</span>
         </div>
+
+        {/* Right badge — status/countdown */}
+        <div className={styles.badgeRight}>
+          {isLive && (
+            <span className={styles.liveBadge}>
+              <span className={styles.liveDot} />
+              LIVE
+            </span>
+          )}
+          {isFinished && (
+            <span className={styles.finishedBadge}>{STATUS_LABELS[match.status] ?? match.status}</span>
+          )}
+          {(state === 'open' || state === 'tipped') && match.tippable && (
+            <span className={`${styles.countdownBadge} ${remainingMins < 60 ? styles.countdownUrgent : ''}`}>
+              {match.minutesUntilKickoff < 60
+                ? `${remainingMins}m`
+                : (() => {
+                    const h = Math.floor(match.minutesUntilKickoff / 60);
+                    if (h < 24) return `${h}h`;
+                    const d = Math.floor(h / 24);
+                    return `${d}d`;
+                  })()
+              }
+            </span>
+          )}
+        </div>
       </div>
 
       {/* Tipp area — wird zum farbigen Banner wenn Punkte ausgewertet */}
diff --git a/frontend/src/pages/DashboardPage.module.css b/frontend/src/pages/DashboardPage.module.css
index 9de5c1f..d565730 100644
--- a/frontend/src/pages/DashboardPage.module.css
+++ b/frontend/src/pages/DashboardPage.module.css
@@ -1,6 +1,6 @@
 .dashboard {
-  padding: 16px;
-  max-width: 600px;
+  padding: 12px;
+  max-width: 800px;
   margin: 0 auto;
   display: flex;
   flex-direction: column;