diff --git a/src/routes/(print)/print/batch/+page.svelte b/src/routes/(print)/print/batch/+page.svelte
index 16bc878..d2783c8 100644
--- a/src/routes/(print)/print/batch/+page.svelte
+++ b/src/routes/(print)/print/batch/+page.svelte
@@ -32,28 +32,30 @@
 
 {#each data.labels as label}
 	<div class="label" style="width: 62mm; height: 29mm; background: white; color: black; box-sizing: border-box; padding: 1mm; margin: 0 auto 8px auto; border: 1px dashed #ccc; overflow: hidden;">
-		<div style="display: flex; flex-direction: column; justify-content: center; align-items: flex-start; height: 100%; font-family: 'JetBrains Mono', monospace; text-align: left;">
+		<div style="display: flex; flex-direction: column; justify-content: center; height: 100%; font-family: 'JetBrains Mono', monospace;">
 			<div style="font-size: 9pt; font-weight: bold; color: #000; line-height: 1.1; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; max-width: 100%;">
 				{label.title}
 			</div>
-			{#if label.brand || label.model}
-				<div style="font-size: 5.5pt; color: #444; line-height: 1.2; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; max-width: 100%;">
-					{[label.brand, label.model].filter(Boolean).join(' ')}
-				</div>
-			{/if}
-			{#if label.serialNumber}
-				<div style="font-size: 5pt; color: #666;">S/N: {label.serialNumber}</div>
-			{/if}
-			{#if label.voltage || label.frequency}
-				<div style="font-size: 5pt; color: #666;">
-					{[label.voltage, label.frequency].filter(Boolean).join(' / ')}
-				</div>
-			{/if}
-			<div style="margin-top: 0.5mm;">
-				<img src={label.barcodeDataUrl} alt={label.shortId} style="height: 5mm; width: auto; max-width: 56mm;" />
+			<div style="margin-top: 1mm;">
+				{#if label.brand || label.model}
+					<div style="font-size: 6.5pt; color: #444; line-height: 1.3; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; max-width: 100%;">
+						{[label.brand, label.model].filter(Boolean).join(' ')}
+					</div>
+				{/if}
+				{#if label.serialNumber}
+					<div style="font-size: 6pt; color: #666;">S/N: {label.serialNumber}</div>
+				{/if}
+				{#if label.voltage || label.frequency}
+					<div style="font-size: 6pt; color: #666;">
+						{[label.voltage, label.frequency].filter(Boolean).join(' / ')}
+					</div>
+				{/if}
 			</div>
-			<div style="font-size: 9pt; font-weight: bold; color: #000; letter-spacing: 1.5px; margin-top: 0.3mm;">
-				{label.shortId}
+			<div style="display: flex; align-items: center; gap: 2mm; margin-top: 1mm;">
+				<div style="font-size: 9pt; font-weight: bold; color: #000; letter-spacing: 1.5px;">
+					{label.shortId}
+				</div>
+				<img src={label.barcodeDataUrl} alt={label.shortId} style="height: 5mm; width: auto; max-width: 35mm;" />
 			</div>
 		</div>
 	</div>
diff --git a/src/routes/(print)/print/component/[id]/+page.svelte b/src/routes/(print)/print/component/[id]/+page.svelte
index 64278cb..8a49173 100644
--- a/src/routes/(print)/print/component/[id]/+page.svelte
+++ b/src/routes/(print)/print/component/[id]/+page.svelte
@@ -40,22 +40,24 @@
 
 {#each Array(copies) as _}
 	<div class="label" style="width: 62mm; height: 29mm; background: white; color: black; box-sizing: border-box; padding: 1mm; margin: 0 auto 8px auto; border: 1px dashed #ccc; overflow: hidden;">
-		<div style="display: flex; flex-direction: column; justify-content: center; align-items: flex-start; height: 100%; font-family: 'JetBrains Mono', monospace; text-align: left;">
+		<div style="display: flex; flex-direction: column; justify-content: center; height: 100%; font-family: 'JetBrains Mono', monospace;">
 			<div style="font-size: 9pt; font-weight: bold; color: #000; line-height: 1.1; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; max-width: 100%;">
 				{data.component.title}
 			</div>
-			<div style="font-size: 5.5pt; color: #444; line-height: 1.2; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; max-width: 100%;">
-				{data.component.componentType}
-				{#if data.component.brand}&middot; {data.component.brand}{/if}
+			<div style="margin-top: 1mm;">
+				<div style="font-size: 6.5pt; color: #444; line-height: 1.3; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; max-width: 100%;">
+					{data.component.componentType}
+					{#if data.component.brand}&middot; {data.component.brand}{/if}
+				</div>
+				{#if data.component.partNumber}
+					<div style="font-size: 6pt; color: #666;">P/N: {data.component.partNumber}</div>
+				{/if}
 			</div>
-			{#if data.component.partNumber}
-				<div style="font-size: 5pt; color: #666;">P/N: {data.component.partNumber}</div>
-			{/if}
-			<div style="margin-top: 0.5mm;">
-				<img src={data.barcodeDataUrl} alt={data.shortId} style="height: 5mm; width: auto; max-width: 56mm;" />
-			</div>
-			<div style="font-size: 9pt; font-weight: bold; color: #000; letter-spacing: 1.5px; margin-top: 0.3mm;">
-				{data.shortId}
+			<div style="display: flex; align-items: center; gap: 2mm; margin-top: 1mm;">
+				<div style="font-size: 9pt; font-weight: bold; color: #000; letter-spacing: 1.5px;">
+					{data.shortId}
+				</div>
+				<img src={data.barcodeDataUrl} alt={data.shortId} style="height: 5mm; width: auto; max-width: 35mm;" />
 			</div>
 		</div>
 	</div>
diff --git a/src/routes/(print)/print/device/[id]/+page.svelte b/src/routes/(print)/print/device/[id]/+page.svelte
index e9c3e00..ca4b219 100644
--- a/src/routes/(print)/print/device/[id]/+page.svelte
+++ b/src/routes/(print)/print/device/[id]/+page.svelte
@@ -40,28 +40,30 @@
 
 {#each Array(copies) as _}
 	<div class="label" style="width: 62mm; height: 29mm; background: white; color: black; box-sizing: border-box; padding: 1mm; margin: 0 auto 8px auto; border: 1px dashed #ccc; overflow: hidden;">
-		<div style="display: flex; flex-direction: column; justify-content: center; align-items: flex-start; height: 100%; font-family: 'JetBrains Mono', monospace; text-align: left;">
+		<div style="display: flex; flex-direction: column; justify-content: center; height: 100%; font-family: 'JetBrains Mono', monospace;">
 			<div style="font-size: 9pt; font-weight: bold; color: #000; line-height: 1.1; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; max-width: 100%;">
 				{data.device.title}
 			</div>
-			{#if data.device.brand || data.device.model}
-				<div style="font-size: 5.5pt; color: #444; line-height: 1.2; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; max-width: 100%;">
-					{[data.device.brand, data.device.model].filter(Boolean).join(' ')}
-				</div>
-			{/if}
-			{#if data.device.serialNumber}
-				<div style="font-size: 5pt; color: #666;">S/N: {data.device.serialNumber}</div>
-			{/if}
-			{#if data.device.voltage || data.device.frequency}
-				<div style="font-size: 5pt; color: #666;">
-					{[data.device.voltage, data.device.frequency].filter(Boolean).join(' / ')}
-				</div>
-			{/if}
-			<div style="margin-top: 0.5mm;">
-				<img src={data.barcodeDataUrl} alt={data.shortId} style="height: 5mm; width: auto; max-width: 56mm;" />
+			<div style="margin-top: 1mm;">
+				{#if data.device.brand || data.device.model}
+					<div style="font-size: 6.5pt; color: #444; line-height: 1.3; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; max-width: 100%;">
+						{[data.device.brand, data.device.model].filter(Boolean).join(' ')}
+					</div>
+				{/if}
+				{#if data.device.serialNumber}
+					<div style="font-size: 6pt; color: #666;">S/N: {data.device.serialNumber}</div>
+				{/if}
+				{#if data.device.voltage || data.device.frequency}
+					<div style="font-size: 6pt; color: #666;">
+						{[data.device.voltage, data.device.frequency].filter(Boolean).join(' / ')}
+					</div>
+				{/if}
 			</div>
-			<div style="font-size: 9pt; font-weight: bold; color: #000; letter-spacing: 1.5px; margin-top: 0.3mm;">
-				{data.shortId}
+			<div style="display: flex; align-items: center; gap: 2mm; margin-top: 1mm;">
+				<div style="font-size: 9pt; font-weight: bold; color: #000; letter-spacing: 1.5px;">
+					{data.shortId}
+				</div>
+				<img src={data.barcodeDataUrl} alt={data.shortId} style="height: 5mm; width: auto; max-width: 35mm;" />
 			</div>
 		</div>
 	</div>