diff --git a/nextrip.php b/nextrip.php
index 41504ec..26571f6 100644
--- a/nextrip.php
+++ b/nextrip.php
@@ -26,7 +26,7 @@
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 
-	<title>NexTrip停留所の情報</title>
+	<title>停留所のNexTrip情報</title>
 
 	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
 </head>
@@ -40,7 +40,7 @@
 	<header>
 		<nav class="navbar navbar-light bg-light">
 			<div class="container-fluid">
-				<a class="navbar-brand" href="https://nextrip.xn--rdk.xn--tckwe/">NexTrip停留所の情報</a>
+				<a class="navbar-brand" href="https://nextrip.xn--rdk.xn--tckwe/">停留所のNexTrip情報</a>
 				<ul class="navbar-nav">
 					<li class="nav-item">
 						<a class="nav-link" href="https://gist.github.com/Epicpkmn11/6e60adbf3475277b753b259ab02a53cd" target="_blank">ソース</a>
@@ -51,104 +51,96 @@
 	</header>
 
 	<main class="mt-3">
-		<div class="container-fluid">
-			<div class="row">
-				<div class="col-12">
-					<form>
-						<div class="input-group mb-3">
-							<label for="stop" class="input-group-text">停留所</label>
-							<input type="text" id="stop" name="stop" class="form-control" placeholder="12345" value="<?php echo $stop; ?>">
-							<input type="submit" class="btn btn-outline-secondary">
-						</div>
-					</form>
-				</div>
-			</div>
+		<div class="container-fluid" style="max-width: 768px">
+			<?php
+				if(isset($stop)) {
+					if(preg_match("/[^\\d]/", $stop)) {
+						echo "<h3 class=\"alert alert-danger\">{$stop}は無効な停留所です。</h3>";
+					} else {
+						$directions = [
+							"NB" => "北行",
+							"EB" => "東行",
+							"SB" => "南行",
+							"WB" => "西行"
+						];
+				
+						$content = file_get_contents("https://svc.metrotransit.org/NexTrip/$stop?format=json");
+						$json = json_decode($content);
+				
+						if(!isset($json)) {
+							echo "<h3 class=\"alert alert-danger\">{$stop}は無効な停留所です。</h3>";
+						} else {
+							echo "<h3 class=\"border-bottom\">停留所{$stop}のNexTrip情報</h3>";
+							echo '<div class="row row-cols-2 row-cols-sm-4 row-cols-md-6">';
+							foreach($json as $bus) {
+								echo '<div class="col">';
+								echo "<p><span class=\"fw-bold\">$bus->Route{$bus->Terminal}（{$directions[$bus->RouteDirection]}）</span><br>";
+								echo "$bus->DepartureText</p>";
+								echo '</div>';
+							}
+							echo '</div>';
 
-			<div class="row">
-				<div class="col-12">
-					<?php
-						if(isset($stop)) {
-							if(preg_match("/[^\\d]/", $stop)) {
-								echo "<h3 class=\"alert alert-danger\">{$stop}は無効な停留所です。</h3>";
-							} else {
-								$directions = [
-									"NB" => "北行",
-									"EB" => "東行",
-									"SB" => "南行",
-									"WB" => "西行"
-								];
-						
-								$content = file_get_contents("https://svc.metrotransit.org/NexTrip/$stop?format=json");
-								$json = json_decode($content);
-						
-								if(!$json) {
-									echo "<h3 class=\"alert alert-danger\">{$stop}は無効な停留所です。</h3>";
-								} else {
-									echo "<h3 class=\"border-bottom\">停留所{$stop}のNexTrip情報</h3>";
-									echo '<div class="row row-cols-2 row-cols-md-4 row-cols-lg-6">';
-									foreach($json as $bus) {
-										echo '<div class="col">';
-										echo "<p><span class=\"fw-bold\">$bus->Route{$bus->Terminal}（{$directions[$bus->RouteDirection]}）</span><br>";
-										echo "$bus->DepartureText</p>";
-										echo '</div>';
-									}
-									echo '</div>';
+							$favDesc = json_decode($_COOKIE['favorites'], true)[$stop];
 
-									$favDesc = json_decode($_COOKIE['favorites'], true)[$stop];
+							echo '<form>';
+							echo "<input type=\"hidden\" name=\"fav-set\" value=\"$stop\">";
+							echo '<div class="input-group mb-3">';
+							echo '<label for="desc" class="input-group-text">お気に入り</label>';
+							echo "<input type=\"text\" id=\"desc\" name=\"desc\" class=\"form-control\" placeholder=\"説明\" value=\"$favDesc\" required>";
+							if(isset($favDesc))
+								echo '<input type="submit" class="btn btn-outline-secondary" value="更新">';
+							else
+								echo '<input type="submit" class="btn btn-outline-secondary" value="追加">';
+							echo '</div>';
+							echo '</form>';
+						}
+					}
+				} else {
+					echo '<div class="row">';
+					echo '<div class="col-12">';
+					echo '<form>';
+					echo '<div class="input-group mb-3">';
+					echo '<label for="stop" class="input-group-text">停留所</label>';
+					echo '<input type="text" id="stop" name="stop" class="form-control" placeholder="12345">';
+					echo '<input type="submit" class="btn btn-outline-secondary">';
+					echo '</div>';
+					echo '</form>';
+					echo '</div>';
+					echo '</div>';
 
-									echo '<div class="row">';
-									echo '<div class="col-12">';
-									echo '<form>';
-									echo "<input type=\"hidden\" name=\"fav-set\" value=\"$stop\">";
-									echo '<div class="input-group mb-3">';
-									echo '<label for="desc" class="input-group-text">お気に入り</label>';
-									echo "<input type=\"text\" id=\"desc\" name=\"desc\" class=\"form-control\" placeholder=\"説明\" value=\"$favDesc\" required>";
-									if(isset($favDesc))
-										echo '<input type="submit" class="btn btn-outline-secondary" value="更新">';
-									else
-										echo '<input type="submit" class="btn btn-outline-secondary" value="追加">';
-									echo '</div>';
-									echo '</form>';
-									echo '</div>';
-									echo '</div>';
-								}
-							}
-						} else {
-							$favorites = isset($_COOKIE['favorites']) ? json_decode($_COOKIE['favorites'], true) : Array();
+					$favorites = isset($_COOKIE['favorites']) ? json_decode($_COOKIE['favorites'], true) : Array();
 
-							if(isset($favSet)) {
-								$desc = $_GET['desc'];
+					if(isset($favSet)) {
+						$desc = $_GET['desc'];
 
-								$favorites[$favSet] = $desc;
-								ksort($favorites);
-								setcookie("favorites", json_encode($favorites));
-								echo "<h3 class=\"alert alert-info\">{$favSet}({$desc})は設定しました。</h3>";
-							} else if(isset($favRemove)) {
-								if(array_key_exists($favRemove, $favorites)) {
-									$desc = $favorites[$favRemove];
-									unset($favorites[$favRemove]);
-									setcookie("favorites", json_encode($favorites));
-									echo "<h3 class=\"alert alert-info\">{$favRemove}({$desc})は削除しました。</h3>";
-								} else {
-									echo "<h3 class=\"alert alert-warning\">{$favRemove}はお気に入りにありません。</h3>";
-								}
-							}
+						$favorites[$favSet] = $desc;
+						ksort($favorites);
+						setcookie("favorites", json_encode($favorites));
+						echo "<h3 class=\"alert alert-info\">{$favSet}({$desc})は設定しました。</h3>";
+					} else if(isset($favRemove)) {
+						if(array_key_exists($favRemove, $favorites)) {
+							$desc = $favorites[$favRemove];
+							unset($favorites[$favRemove]);
+							setcookie("favorites", json_encode($favorites));
+							echo "<h3 class=\"alert alert-info\">{$favRemove}({$desc})は削除しました。</h3>";
+						} else {
+							echo "<h3 class=\"alert alert-warning\">{$favRemove}はお気に入りにありません。</h3>";
+						}
+					}
 
-							if(count($favorites) > 0) {
-								echo '<h2 class="border-bottom">お気に入り</h2>';
-								echo '<ul>';
-								foreach($favorites as $favStop => $favDesc) {
-									echo '<li class="mb-1">';
-									echo "<a class=\"btn btn-sm btn-secondary\" href=\"?stop=$favStop\">$favStop ($favDesc)</a> ";
-									echo "<a class=\"btn btn-sm btn-danger\" href=\"?fav-remove=$favStop\" aria-label=\"Remove\">×</a>";
-									echo '</li>';
-								}
-								echo '</ul>';
-							}
+					if(count($favorites) > 0) {
+						echo '<h2 class="border-bottom">お気に入り</h2>';
+						echo '<ul class="list-unstyled">';
+						foreach($favorites as $favStop => $favDesc) {
+							echo '<li class="mb-1 d-flex">';
+							echo "<a class=\"btn btn-sm btn-secondary flex-fill me-1 text-start\" href=\"?stop=$favStop\">$favStop ($favDesc)</a>";
+							echo "<a class=\"btn btn-sm btn-danger\" href=\"?fav-remove=$favStop\" aria-label=\"Remove\">×</a>";
+							echo '</li>';
 						}
-					?>
-				</div>
-			</div>
+						echo '</ul>';
+					}
+				}
+			?>
 		</div>
 	</main>