diff --git a/config.html b/config.html
index 38f1363..a285bd5 100644
--- a/config.html
+++ b/config.html
@@ -11,13 +11,9 @@
 	<body>
 		<div class="center-div">
 			<form>
-				<fieldset id="user-configurable">
+				<fieldset>
 					<legend>Change Configuration</legend>
-					<div class="labels-inputs">
-						<div id="labels">
-						</div>
-						<div id="inputs">
-						</div>
+					<div class="labels-inputs" id="user-configurable">
 					</div>
 					<div class="btn-group" id="form-actions">
 						<button id="cancel">CANCEL</button>
diff --git a/css/form.css b/css/form.css
index cb4374c..072136f 100644
--- a/css/form.css
+++ b/css/form.css
@@ -25,10 +25,7 @@ button {
 }
 
 .labels-inputs {
-	display: flex;
+	display: grid;
+	grid-template-columns: auto auto;
 	column-gap: 10px;
-}
-
-.labels-inputs > div {
-	width: max-content;
 }
\ No newline at end of file
diff --git a/login.html b/login.html
index a167ca1..abddeb1 100644
--- a/login.html
+++ b/login.html
@@ -14,14 +14,10 @@
 				<fieldset>
 					<legend>Proxmox VE Login</legend>
 					<div class="labels-inputs">
-						<div>
-							<div><label for="username">Username:</label></div>
-							<div><label for="username">Password:</label></div>
-						</div>
-						<div>
-							<div><input type="text" id="username" name="username"></div>
-							<div><input type="password" id="password" name="password"></div>
-						</div>
+						<label for="username">Username:</label>
+						<input type="number" min="1" max="10" id="username" name="username">
+						<label for="username">Password:</label>
+						<input type="password" id="password" name="password">
 					</div>
 					<div class="btn-group">
 						<button id="submit">LOGIN</button>
diff --git a/scripts/config.js b/scripts/config.js
index 1e643a5..5c89fe9 100644
--- a/scripts/config.js
+++ b/scripts/config.js
@@ -19,22 +19,18 @@ async function populateForm (node, type, vmid) {
 }
 
 function addFormLine (id, labelName, inputAttr) {
-	let labelWrapperDiv = document.createElement("div");
+	let form = document.querySelector("#user-configurable");
+
 	let label = document.createElement("label");
 	label.for = id;
 	label.innerHTML = labelName;
-	labelWrapperDiv.append(label);
-	let labelContainer = document.querySelector("#labels");
-	labelContainer.append(labelWrapperDiv);
+	form.append(label);
 
-	let inputWrapperDiv = document.createElement("div");
 	let input = document.createElement("input");
 	input.id = id;
 	input.name = id;
 	for (let k in inputAttr) {
 		input.setAttribute(k, inputAttr[k])
 	}
-	inputWrapperDiv.append(input);
-	let inputContainer = document.querySelector("#inputs");
-	inputContainer.append(inputWrapperDiv);
+	form.append(input);
 }
\ No newline at end of file
