diff --git a/nummi/main/static/main/css/form.css b/nummi/main/static/main/css/form.css
index 0ad5bbf..28ff0f3 100644
--- a/nummi/main/static/main/css/form.css
+++ b/nummi/main/static/main/css/form.css
@@ -26,22 +26,28 @@ form input {
 }
 
 form > label,
-form > input[type="text"],
-form > input[type="number"],
-form > input[type="password"],
-form > select {
+form > div > input[type="text"],
+form > div > input[type="number"],
+form > div > input[type="password"],
+form > div > input[type="file"],
+form > div > select,
+form > div > textarea,
+form > div > select {
 	font-size: inherit;
 	line-height: inherit;
 	font-family: inherit;
+	height: 100%;
+	width: 100%;
 }
-form > textarea {
-	font-size: inherit;
-	font-family: inherit;
+form > div > textarea {
+	line-height: initial;
 }
-form > input[type="text"],
-form > input[type="number"],
-form > input[type="password"],
-form > textarea {
+form > div > input[type="text"],
+form > div > input[type="number"],
+form > div > input[type="password"],
+form > div > input[type="file"],
+form > div > textarea,
+form > div > select {
 	border: none;
 	border-radius: var(--radius);
 	background: var(--bg-01);
@@ -51,9 +57,7 @@ form > .buttons {
 	grid-column: 1 / -1;
 	text-align: right;
 }
-form > .buttons > *,
-form select,
-form input[type="file"] {
+form > .buttons > * {
 	font-size: inherit;
 	line-height: inherit;
 	font-family: inherit;
diff --git a/nummi/main/templates/main/form.html b/nummi/main/templates/main/form.html
index 6ea161d..e69f304 100644
--- a/nummi/main/templates/main/form.html
+++ b/nummi/main/templates/main/form.html
@@ -8,5 +8,5 @@
 {% for field in form %}
 {{ field.errors }}
 <label for="{{ field.id_for_label }}">{{ field.label }}</label>
-{{ field }}
+<div>{{ field }}</div>
 {% endfor %}