diff --git a/src/lib/components/ui/Textbox.svelte b/src/lib/components/ui/Textbox.svelte
index 8619f50..95ccd23 100644
--- a/src/lib/components/ui/Textbox.svelte
+++ b/src/lib/components/ui/Textbox.svelte
@@ -33,7 +33,7 @@
 		if (onsubmit && value) {
 			onsubmit(value);
 		}
-	}
+	};
 </script>
 
 <div class="input-wrapper" class:focussed={isFocussed} class:has-error={!!error}>
@@ -42,28 +42,28 @@
 	{/if}
 
 	<form onsubmit={handleSubmit} class="input-container">
-	<input
-		id="adaptive-input"
-		class:all-caps={uppercase}
-		{type}
-		{placeholder}
-		bind:value
-		onfocus={() => (isFocussed = true)}
-		onblur={() => (isFocussed = false)}
-		{...rest}
-	/>
+		<input
+			id="adaptive-input"
+			class:all-caps={uppercase}
+			{type}
+			{placeholder}
+			bind:value
+			onfocus={() => (isFocussed = true)}
+			onblur={() => (isFocussed = false)}
+			{...rest}
+		/>
 
-	{#if onsubmit}
-	<button
-		type="submit"
-		class="submit-icon"
-		transition:fade
-		disabled={!value}
-		aria-label="Submit"
-	>
-		<IconChevronRightFilled />
-	</button>
-	{/if}
+		{#if onsubmit}
+			<button
+				type="submit"
+				class="submit-icon"
+				transition:fade
+				disabled={!value}
+				aria-label="Submit"
+			>
+				<IconChevronRightFilled />
+			</button>
+		{/if}
 	</form>
 
 	{#if error}
@@ -125,18 +125,20 @@
 		align-items: center;
 		justify-content: center;
 		opacity: 0.75;
-		transition: opacity 0.2s, transform 0.2s;
+		transition:
+			opacity 0.2s,
+			transform 0.2s;
 	}
 
 	.submit-icon:hover:not(:disabled) {
-        opacity: 1;
-        transform: translateX(2px);
-    }
+		opacity: 1;
+		transform: translateX(2px);
+	}
 
-    .submit-icon:disabled {
-        opacity: 0.5;
-        cursor: not-allowed;
-    }
+	.submit-icon:disabled {
+		opacity: 0.5;
+		cursor: not-allowed;
+	}
 
 	.all-caps {
 		text-transform: uppercase;
diff --git a/src/lib/components/ui/TrainService.svelte b/src/lib/components/ui/TrainService.svelte
index 820918d..e83d87a 100644
--- a/src/lib/components/ui/TrainService.svelte
+++ b/src/lib/components/ui/TrainService.svelte
@@ -93,7 +93,7 @@
 	};
 </script>
 
-<div class="train-service" class:isExpanded={isExpanded}>
+<div class="train-service" class:isExpanded>
 	<button class="summary" onclick={toggleExpand} type="button" aria-expanded={isExpanded}>
 		{#if loadingDetails}
 			<div class="loading-state"><div class="loading-spinner"></div></div>
@@ -147,7 +147,15 @@
 				{/if}
 				{#if details.pis}
 					<div class="pis-detail">
-						{details.pis.code}
+						<span class="pis-code">PIS: {details.Pis.code}</span>
+						{#if details.Pis.skip?.skip > 0}
+							<span class="pis-skip">
+								(skip {details.Pis.skip.position === 'head' ? 'first' : 'last'}
+								{details.Pis.skip.skip}
+								{details.Pis.skip.skip === 1 ? 'stop' : 'stops'}
+								)
+							</span>
+						{/if}
 					</div>
 				{/if}
 			</div>
@@ -173,8 +181,7 @@
 						</tr>
 					</thead>
 					{#each details.locations as loc}
-					<tbody class="location-group">
-						
+						<tbody class="location-group">
 							<tr class:pass-loc={loc.r === 'PASS'} class:can-loc={loc.can}>
 								<td class="tpl-cell" class:tpl-stop={loc.r != 'PASS'}>
 									{loc.t}
@@ -202,18 +209,17 @@
 								{/if}
 							</tr>
 							{#if loc.act && getRelevantActivities(loc.act).length > 0}
-							<tr class="activity-row">
-								<td colspan="7">
-									<div class="activity-container">
-										{#each getRelevantActivities(loc.act) as note}
-										<span class="activity-tag">{note}</span>
-										{/each}
-									</div>
-								</td>
-							</tr>
+								<tr class="activity-row">
+									<td colspan="7">
+										<div class="activity-container">
+											{#each getRelevantActivities(loc.act) as note}
+												<span class="activity-tag">{note}</span>
+											{/each}
+										</div>
+									</td>
+								</tr>
 							{/if}
-						
-					</tbody>{/each}
+						</tbody>{/each}
 				</table>
 			</div>
 		</div>
@@ -318,6 +324,29 @@
 		color: red;
 	}
 
+	/*
+		PIS Data
+	*/
+	.pis-detail {
+		display: flex;
+		align-items: center;
+		flex-direction: column;
+		gap: 0.2rem;
+		padding: 8px 0;
+		width: 100%;
+	}
+	.pis-code {
+		font-weight: 600;
+		font-size: 1.1rem;
+		letter-spacing: 0.05em;
+	}
+
+	.pis-skip {
+		font-size: 0.85rem;
+		opacity: 0.75;
+		font-style: oblique;
+	}
+
 	/*
 		Box Extention
 	*/
@@ -416,9 +445,9 @@
 
 	.activity-tag {
 		background: rgba(255, 255, 255, 0.1);
-        border: 1px solid rgba(255, 255, 255, 0.05);
-        padding: 2px 6px;
-        border-radius: 4px;
+		border: 1px solid rgba(255, 255, 255, 0.05);
+		padding: 2px 6px;
+		border-radius: 4px;
 	}
 
 	.tpl-cell {
diff --git a/src/lib/components/ui/cards/HeadcodeSearchCard.svelte b/src/lib/components/ui/cards/HeadcodeSearchCard.svelte
index 477e46a..975923c 100644
--- a/src/lib/components/ui/cards/HeadcodeSearchCard.svelte
+++ b/src/lib/components/ui/cards/HeadcodeSearchCard.svelte
@@ -18,7 +18,12 @@
 
 <BaseCard header={'Search Train & PIS'}>
 	<div class="card-content">
-		<Textbox placeholder="Enter Headcode" bind:value={headcode} maxLength={4} onsubmit={handleSearch} />
+		<Textbox
+			placeholder="Enter Headcode"
+			bind:value={headcode}
+			maxLength={4}
+			onsubmit={handleSearch}
+		/>
 	</div>
 </BaseCard>