diff --git a/uploadpage/index.php b/uploadpage/index.php
index ca96224..e20ce19 100755
--- a/uploadpage/index.php
+++ b/uploadpage/index.php
@@ -26,8 +26,8 @@ function filename(){
 		<h1>Stream Upload</h1>
 		<form action="upload.php" method="post" enctype="multipart/form-data" onsubmit="respond()">
 			<div class="fileinput">
-				<input id="input" type="file" name="file" required accept=".mp4" onchange="filename()">
-				<input class="abs" id="fakeinput">
+				<input id="input" type="file" name="file" required accept=".mp4" onchange="filename()" autofocus>
+				<input class="abs" id="fakeinput" tabindex="-1">
 				<p class="abs" id="name">Click to select the video</p>
 			</div>
 			<select name="target" id="target" required title="Click to select where to stream to">
@@ -37,8 +37,10 @@ function filename(){
 				<option value="YouTube">YouTube</option>
 			</select>
 			<input type="text" name="streamkey" placeholder="Stream Key" required title="Enter a string of 0-9, a-z, A-Z, underscore or dash characters" pattern="[a-zA-Z0-9_-]+">
-			<input type="datetime-local" name="datetime" title="Click on the date to get a popup" required>
-			<!--input type="file" name="file" required accept=".mp4" title="Click to select a video"-->
+			<!--input type="datetime-local" name="datetime" title="Click on the date to get a popup" required-->
+			<div class="datetime">
+				<input type="date" name="date" title="Click on the date to get a popup" required>
+				<input type="time" name="time" title="Click on the time to get a popup" required></div>
 			<input type="email" name="email" placeholder="Email to notify" title="Not required">
 			<input type="submit" value="Schedule Stream" name="schedule">
 			<p id="response"></p>
diff --git a/uploadpage/login.php b/uploadpage/login.php
index e7aacac..fd37bc4 100755
--- a/uploadpage/login.php
+++ b/uploadpage/login.php
@@ -36,7 +36,7 @@ print('
 		<form action="login.php" method="post">
 			<input type="text" name="user" placeholder="Username" required title="string of 0-9, a-z, A-Z" pattern="[a-zA-Z0-9]+">
 			<input type="password" name="password" placeholder="Password" required>
-			<input type="submit" name="login" value="Login">
+			<input type="submit" name="login" value="Login" autofocus>
 		</form>
 	</div>
 </div>');
diff --git a/uploadpage/page.css b/uploadpage/page.css
index 8fc0b1f..1600406 100755
--- a/uploadpage/page.css
+++ b/uploadpage/page.css
@@ -84,6 +84,22 @@ input[type=submit] {
 	position:relative;
 	max-width:fit-content(325px);
 }
+.datetime {
+	display:flex;
+	flex-direction:rows;
+	text-align:center;
+	space-between;
+}
+input[type=date] {
+	width:56%;
+	padding-left:0;
+	padding-right:0;
+}
+input[type=time] {
+	width:40%;
+	padding-left:0;
+	padding-right:0;
+}
 #name {
 	padding-top:5px;
 	font-weight:bold;
diff --git a/uploadpage/upload.php b/uploadpage/upload.php
index cfe363c..cfb7f28 100755
--- a/uploadpage/upload.php
+++ b/uploadpage/upload.php
@@ -8,7 +8,7 @@ if(!isset($_POST['schedule'])){ // If not post: start again
 function Back($msg){
 	print('<p>'.$msg.'</p>
 <form action="index.php" method="post">
-<input type="submit" value="Upload another file" name="submit">
+<input type="submit" value="Upload another file" name="submit" autofocus>
 </form></div>');
 	exit;
 }