diff --git a/thrimbletrimmer/edit.html b/thrimbletrimmer/edit.html
index 47bbcd2..27d007f 100644
--- a/thrimbletrimmer/edit.html
+++ b/thrimbletrimmer/edit.html
@@ -110,21 +110,15 @@
 				<div id="video-info-editor-notes-header">Editor Notes:</div>
 				<div id="video-info-editor-notes"></div>
 			</div>
-			<div>
-				<label for="video-info-title">Title:</label>
-				<div id="video-info-title-full">
-					<span id="video-info-title-prefix"></span>
-					<input type="text" id="video-info-title" />
-				</div>
-			</div>
-			<div id="video-info-description-entry">
-				<label for="video-info-description">Description:</label>
-				<textarea id="video-info-description"></textarea>
-			</div>
-			<div>
-				<label for="video-info-tags">Tags (comma-separated):</label>
-				<input type="text" id="video-info-tags" />
+			<label for="video-info-title">Title:</label>
+			<div id="video-info-title-full">
+				<span id="video-info-title-prefix"></span>
+				<input type="text" id="video-info-title" />
 			</div>
+			<label for="video-info-description">Description:</label>
+			<textarea id="video-info-description"></textarea>
+			<label for="video-info-tags">Tags (comma-separated):</label>
+			<input type="text" id="video-info-tags" />
 		</div>
 
 		<div id="submission">
diff --git a/thrimbletrimmer/styles/thrimbletrimmer.css b/thrimbletrimmer/styles/thrimbletrimmer.css
index 496ee04..dc3426c 100644
--- a/thrimbletrimmer/styles/thrimbletrimmer.css
+++ b/thrimbletrimmer/styles/thrimbletrimmer.css
@@ -158,8 +158,18 @@ a,
 	margin-top: 2px;
 }
 
-#video-info > div {
+#video-info {
 	margin: 5px 0;
+	display: grid;
+	grid-template-columns: 175px 1fr;
+	grid-template-rows: 1fr 1.25em 3em 1.25em;
+	gap: 2px;
+}
+
+#video-info-editor-notes-container {
+	border: 1px solid #666;
+	background-color: #bde;
+	grid-column-end: span 2;
 }
 
 #video-info-title-full {
@@ -172,21 +182,6 @@ a,
 	flex-grow: 1;
 }
 
-#video-info-description-entry {
-	display: flex;
-	align-items: flex-start;
-	gap: 5px;
-}
-
-#video-info-description {
-	flex-grow: 1;
-}
-
-#video-info-editor-notes-container {
-	border: 1px solid #666;
-	background-color: #bde;
-}
-
 .submission-response-error {
 	white-space: pre-wrap;
 }