diff --git a/app/static/css/search.css b/app/static/css/search.css
index 4238f9e..2bb5cb4 100644
--- a/app/static/css/search.css
+++ b/app/static/css/search.css
@@ -4,24 +4,43 @@
   grid-template-rows: 40% 40% 20%;
   grid-template-rows: 5em 5em 100%;
 }
+.search-page > form input,
+.search-page > form select {
+  width: 100%;
+  height: 2rem;
+}
+.search-page > form label {
+  margin-right: 1em;
+}
 .search-page > form div.query {
   grid-area: search;
+  display: flex;
+  align-items: center;
+}
+.search-page > form div.query label {
+  margin-right: 1em;
 }
 .search-page > form div.submit {
   grid-area: submit;
   display: flex;
   align-items: center;
-  width: 40%;
   margin-left: 1em;
 }
+.search-page > form div.submit input#submit {
+  width: fit-content;
+}
 .search-page > form div.date {
   grid-area: date;
+  display: flex;
+  align-items: center;
 }
 .search-page > form div.date input#date {
   width: 80%;
 }
 .search-page > form div.sort {
   grid-area: sort;
+  display: flex;
+  align-items: center;
   margin-left: 2em;
 }
 .search-page > form div.scope {
diff --git a/app/static/less/search.less b/app/static/less/search.less
index 2205df6..1853eb8 100644
--- a/app/static/less/search.less
+++ b/app/static/less/search.less
@@ -7,20 +7,41 @@
 	grid-template-rows: 40% 40% 20%;
 	grid-template-rows: 5em 5em 100%;
 
+	input, select {
+		width: 100%;
+		height: 2rem;
+	}
+
+	label {
+			margin-right: 1em;
+	}
+
 	& div.query {
 		grid-area: search;
+		display: flex;
+		align-items: center;
+
+		& label {
+			margin-right: 1em;
+		}
 	}
 
 	& div.submit {
 		grid-area: submit;
 		display: flex;
 		align-items: center;
-		width: 40%;
 		margin-left: 1em;
+		
+		& input#submit {
+			width: fit-content;
+		}
 	}
 
 	& div.date {
 		grid-area: date;
+		display: flex;
+		align-items: center;
+
 		& input#date {
 			width: 80%;
 		}
@@ -28,6 +49,8 @@
 
 	& div.sort {
 		grid-area: sort;
+		display: flex;
+		align-items: center;
 		margin-left: 2em;
 	}