diff --git a/comments.php b/comments.php
index 53f8300..5c3017a 100644
--- a/comments.php
+++ b/comments.php
@@ -53,12 +53,21 @@ if (post_password_required()) {
 
 	endif; // Check for have_comments().
 	
+	$commenter = wp_get_current_commenter();
+	$req = get_option('require_name_email');
+	$html_req = ($req ? " required='required'" : '');
+
 	$args = array(
 		'class_form' => 'comment-form mt-4',
-		'class_submit' => 'btn btn-secondary fw-bold text-uppercase mt-3',
-		'title_reply_before' => '<h2 id="reply-title" class="comment-reply-title h4 font-sans mb-4">',
+		'class_submit' => 'btn btn-secondary fw-bold text-uppercase mt-4 px-4 py-2',
+		'title_reply_before' => '<h2 id="reply-title" class="comment-reply-title h4 font-sans mb-4 fw-bold">',
 		'title_reply_after' => '</h2>',
-		'comment_field' => '<div class="comment-form-comment mb-3"><label for="comment" class="form-label text-muted small text-uppercase tracking-wider fw-bold">Add a Perspective <span class="text-danger">*</span></label><textarea id="comment" name="comment" cols="45" rows="4" maxlength="65525" required="required" class="form-control"></textarea></div>',
+		'comment_field' => '<div class="comment-form-comment mb-4"><label for="comment" class="form-label text-muted small text-uppercase tracking-wider fw-bold">Add a Perspective <span class="text-danger">*</span></label><textarea id="comment" name="comment" cols="45" rows="4" maxlength="65525" required="required" class="form-control bg-light border-0"></textarea></div>',
+		'fields' => array(
+			'author' => '<div class="row g-3 mb-3"><div class="col-md-6 comment-form-author"><label for="author" class="form-label small fw-bold">Name ' . ($req ? '<span class="text-danger">*</span>' : '') . '</label><input id="author" name="author" type="text" value="' . esc_attr($commenter['comment_author']) . '" size="30" maxlength="245"' . $html_req . ' class="form-control bg-white" /></div>',
+			'email' => '<div class="col-md-6 comment-form-email"><label for="email" class="form-label small fw-bold">Email ' . ($req ? '<span class="text-danger">*</span>' : '') . '</label><input id="email" name="email" type="email" value="' . esc_attr($commenter['comment_author_email']) . '" size="30" maxlength="100" aria-describedby="email-notes"' . $html_req . ' class="form-control bg-white" /></div></div>',
+			'url' => '<div class="comment-form-url mb-4"><label for="url" class="form-label small fw-bold">Website</label><input id="url" name="url" type="url" value="' . esc_attr($commenter['comment_author_url']) . '" size="30" maxlength="200" class="form-control bg-white" /></div>',
+		),
 	);
 	comment_form($args);
 	?>