diff --git a/source/packages/com_mokosuiteclient/admin/tmpl/dashboard/default.php b/source/packages/com_mokosuiteclient/admin/tmpl/dashboard/default.php
index 17a3054c..d9823525 100644
--- a/source/packages/com_mokosuiteclient/admin/tmpl/dashboard/default.php
+++ b/source/packages/com_mokosuiteclient/admin/tmpl/dashboard/default.php
@@ -48,56 +48,33 @@ $actionLogsEnabled = Joomla\CMS\Component\ComponentHelper::isEnabled('com_action
 	</div>
 	<?php endif; ?>
 	<!-- Site Info Bar -->
-	<div class="mokosuiteclient-info-bar card mb-4">
-		<div class="card-body">
-			<div class="mokosuiteclient-info-item">
-				<span class="icon-shield-alt" aria-hidden="true" style="font-size:1.1rem;color:#1a2744"></span>
-				<span class="mokosuiteclient-info-value fw-bold"><?php echo $this->escape($siteInfo->sitename); ?></span>
-			</div>
-			<div class="mokosuiteclient-info-item">
-				<span class="mokosuiteclient-info-label">MokoSuite</span>
-				<span class="mokosuiteclient-info-value"><span class="badge bg-primary"><?php echo $this->escape($siteInfo->mokosuiteclient_version); ?></span></span>
-			</div>
+	<div class="card mb-4">
+		<div class="card-body d-flex flex-wrap align-items-center gap-2" style="padding:0.75rem 1.25rem;font-size:0.85rem;">
+			<span class="icon-shield-alt" aria-hidden="true" style="font-size:1.1rem;color:#1a2744"></span>
+			<span class="fw-bold"><?php echo $this->escape($siteInfo->sitename); ?></span>
+			<span class="badge bg-primary"><?php echo $this->escape($siteInfo->mokosuiteclient_version); ?></span>
 			<?php if (!empty($this->supportPin)): ?>
-			<div class="mokosuiteclient-info-item">
-				<span class="mokosuiteclient-info-label">Support PIN</span>
-				<span class="mokosuiteclient-info-value d-flex align-items-center gap-1">
-					<span class="badge bg-dark" style="font-family:monospace;letter-spacing:0.08em;cursor:help;" title="Daily verification PIN — rotates at midnight UTC."><span class="icon-key small me-1" aria-hidden="true"></span><?php echo $this->escape($this->supportPin); ?></span>
-					<button type="button" class="btn btn-sm btn-outline-primary" id="mokosuiteclient-btn-heartbeat-pin"
-						data-url="<?php echo Route::_('index.php?option=com_mokosuiteclient&task=display.sendHeartbeat&format=json'); ?>"
-						data-token="<?php echo $token; ?>"
-						title="Send heartbeat with PIN to MokoSuiteHQ">
-						<span class="icon-upload" aria-hidden="true"></span>
-					</button>
-				</span>
-			</div>
+				<span class="badge bg-dark" style="font-family:monospace;letter-spacing:0.08em;cursor:help;" title="Daily verification PIN — rotates at midnight UTC."><span class="icon-key small me-1" aria-hidden="true"></span><?php echo $this->escape($this->supportPin); ?></span>
+				<button type="button" class="btn btn-sm btn-outline-primary py-0 px-1" id="mokosuiteclient-btn-heartbeat-pin"
+					data-url="<?php echo Route::_('index.php?option=com_mokosuiteclient&task=display.sendHeartbeat&format=json'); ?>"
+					data-token="<?php echo $token; ?>"
+					title="Send heartbeat with PIN to MokoSuiteHQ">
+					<span class="icon-upload" aria-hidden="true"></span>
+				</button>
 			<?php endif; ?>
-			<div class="mokosuiteclient-info-item">
-				<span class="mokosuiteclient-info-label">Joomla</span>
-				<span class="mokosuiteclient-info-value"><span class="badge bg-secondary"><?php echo $this->escape($siteInfo->joomla_version); ?></span></span>
-			</div>
-			<div class="mokosuiteclient-info-item">
-				<span class="mokosuiteclient-info-label">PHP</span>
-				<span class="mokosuiteclient-info-value"><span class="badge bg-secondary"><?php echo $this->escape($siteInfo->php_version); ?></span></span>
-			</div>
-			<div class="mokosuiteclient-info-item">
-				<span class="mokosuiteclient-info-label"><?php echo Text::_('COM_MOKOSUITECLIENT_DATABASE'); ?></span>
-				<span class="mokosuiteclient-info-value"><span class="badge bg-secondary"><?php echo $this->escape($siteInfo->db_type); ?></span></span>
-			</div>
+			<span class="badge bg-secondary"><?php echo $this->escape($siteInfo->joomla_version); ?></span>
+			<span class="badge bg-secondary">PHP <?php echo $this->escape($siteInfo->php_version); ?></span>
+			<span class="badge bg-secondary"><?php echo $this->escape($siteInfo->db_type); ?></span>
 			<?php if ($siteInfo->debug): ?>
-			<div class="mokosuiteclient-info-item">
-				<span class="mokosuiteclient-info-value"><span class="badge bg-warning text-dark"><?php echo Text::_('COM_MOKOSUITECLIENT_DEBUG_ON'); ?></span></span>
-			</div>
+				<span class="badge bg-warning text-dark">Debug ON</span>
 			<?php endif; ?>
 			<?php if ($siteInfo->offline): ?>
-			<div class="mokosuiteclient-info-item">
-				<span class="mokosuiteclient-info-value"><span class="badge bg-danger"><?php echo Text::_('COM_MOKOSUITECLIENT_OFFLINE'); ?></span></span>
-			</div>
+				<span class="badge bg-danger">Offline</span>
 			<?php endif; ?>
-			<div class="mokosuiteclient-info-item ms-auto">
+			<span class="ms-auto d-flex align-items-center gap-2">
 				<span class="icon-globe" aria-hidden="true"></span>
 				<code><?php echo $this->escape($_SERVER['REMOTE_ADDR'] ?? ''); ?></code>
-			</div>
+			</span>
 		</div>
 	</div>
 
diff --git a/source/packages/mod_mokosuiteclient_cpanel/tmpl/default.php b/source/packages/mod_mokosuiteclient_cpanel/tmpl/default.php
index 4e2bf5f9..8503071c 100644
--- a/source/packages/mod_mokosuiteclient_cpanel/tmpl/default.php
+++ b/source/packages/mod_mokosuiteclient_cpanel/tmpl/default.php
@@ -60,15 +60,15 @@ $diskColor = ($diskPct !== null && $diskPct > 90) ? 'bg-danger' : (($diskPct !==
 ?>
 
 <div class="mod-mokosuiteclient-cpanel card p-3 mb-4">
-	<!-- Info strip (mirrors dashboard top row) -->
+	<!-- Info strip (matches dashboard info bar) -->
 	<div class="d-flex flex-wrap align-items-center gap-2 mb-2" style="font-size:0.85rem;">
 		<span class="icon-shield-alt" aria-hidden="true" style="font-size:1.1rem;color:#1a2744"></span>
 		<span class="fw-bold"><?php echo htmlspecialchars($siteInfo->sitename ?? ''); ?></span>
-		<span class="badge bg-primary">MokoSuite <?php echo htmlspecialchars($siteInfo->mokosuiteclient_version ?? ''); ?></span>
+		<span class="badge bg-primary"><?php echo htmlspecialchars($siteInfo->mokosuiteclient_version ?? ''); ?></span>
 		<?php if (!empty($supportPin)): ?>
-			<span class="badge bg-dark" style="font-family:monospace;letter-spacing:0.08em;" title="Daily verification PIN — rotates at midnight UTC."><span class="icon-key small me-1" aria-hidden="true"></span><?php echo htmlspecialchars($supportPin); ?></span>
+			<span class="badge bg-dark" style="font-family:monospace;letter-spacing:0.08em;cursor:help;" title="Daily verification PIN — rotates at midnight UTC."><span class="icon-key small me-1" aria-hidden="true"></span><?php echo htmlspecialchars($supportPin); ?></span>
 		<?php endif; ?>
-		<span class="badge bg-secondary">J<?php echo htmlspecialchars($siteInfo->joomla_version ?? ''); ?></span>
+		<span class="badge bg-secondary"><?php echo htmlspecialchars($siteInfo->joomla_version ?? ''); ?></span>
 		<span class="badge bg-secondary">PHP <?php echo htmlspecialchars($siteInfo->php_version ?? ''); ?></span>
 		<span class="badge bg-secondary"><?php echo htmlspecialchars($siteInfo->db_type ?? ''); ?></span>
 		<?php if (!empty($siteInfo->debug)): ?>
@@ -77,18 +77,9 @@ $diskColor = ($diskPct !== null && $diskPct > 90) ? 'bg-danger' : (($diskPct !==
 		<?php if (!empty($siteInfo->offline)): ?>
 			<span class="badge bg-danger">Offline</span>
 		<?php endif; ?>
-		<?php if (($counts->moko_updates ?? 0) > 0): ?>
-			<a href="<?php echo Route::_('index.php?option=com_installer&view=update'); ?>" class="badge bg-info text-decoration-none" title="MokoSuite updates available">
-				<span class="icon-upload" aria-hidden="true"></span> <?php echo $counts->moko_updates; ?> update<?php echo $counts->moko_updates > 1 ? 's' : ''; ?>
-			</a>
-		<?php endif; ?>
 		<span class="ms-auto d-flex align-items-center gap-2">
-			<span class="icon-globe text-muted" aria-hidden="true"></span>
-			<code style="font-size:0.8rem;"><?php echo htmlspecialchars($currentIp); ?></code>
-			<a href="<?php echo Route::_('index.php?option=com_mokosuiteclient'); ?>" class="btn btn-sm btn-primary">
-				<span class="icon-cogs" aria-hidden="true"></span>
-				<?php echo Text::_('MOD_MOKOSUITECLIENT_CPANEL_OPEN_DASHBOARD'); ?>
-			</a>
+			<span class="icon-globe" aria-hidden="true"></span>
+			<code><?php echo htmlspecialchars($currentIp); ?></code>
 		</span>
 	</div>
 
@@ -103,6 +94,12 @@ $diskColor = ($diskPct !== null && $diskPct > 90) ? 'bg-danger' : (($diskPct !==
 				<span class="icon-upload" aria-hidden="true"></span> <?php echo $counts->updates - ($counts->moko_updates ?? 0); ?> other update<?php echo ($counts->updates - ($counts->moko_updates ?? 0)) > 1 ? 's' : ''; ?>
 			</a>
 		<?php endif; ?>
+		<span class="ms-auto">
+			<a href="<?php echo Route::_('index.php?option=com_mokosuiteclient'); ?>" class="btn btn-sm btn-primary">
+				<span class="icon-cogs" aria-hidden="true"></span>
+				<?php echo Text::_('MOD_MOKOSUITECLIENT_CPANEL_OPEN_DASHBOARD'); ?>
+			</a>
+		</span>
 	</div>
 	<script>
 	document.addEventListener('DOMContentLoaded', function() {