diff --git a/uploadpage/index.php b/uploadpage/index.php
index 06e00d1..cfbae81 100755
--- a/uploadpage/index.php
+++ b/uploadpage/index.php
@@ -14,43 +14,25 @@ function respond(){
 </script>
 <div class="container">
 	<div class="incontainer">
-		<table>
-			<tr><td></td><td align="center"><h1>Stream Upload</h1></td></tr>
-			<tr>
-				<td class="left">User:</td>
-				<td class="right"><b>'.$user.'</b></td>
-				<form action="check.php" method="post">
-					<td><input class="shiftleft" type="submit" name="logoff" value="Logoff"></td>
-				</form></tr>
-			<form action="upload.php" method="post" enctype="multipart/form-data" onsubmit="respond()">
-				<tr>
-					<td class="left">Target:</td>
-					<td class="right">
-						<select name="target" id="target" required>
-							<option value="" disabled selected hidden>Streaming Destination</option>
-							<option value="Restream">Restream</option>
-							<option value="Facebook">Facebook</option>
-							<option value="YouTube">YouTube</option>
-						</select>
-					</td></tr>
-				<tr>
-					<td class="left">Streamkey:</td>
-					<td class="right"><input type="text" name="streamkey" required title="string of 0-9, a-z, A-Z, underscore or dash characters" pattern="[a-zA-Z0-9_-]+"></td></tr>
-				<tr>
-					<td class="left">Date & Time:</td>
-					<td class="right"><input type="datetime-local" name="datetime" title="Click on the date to get a popup" required></td></tr>
-				<tr>
-					<td class="left">Video File:</td>
-					<td class="right"><input type="file" name="file" required accept=".mp4"></td></tr>
-				<tr>
-					<td class="left">Notify email:</td>
-					<td class="right"><input type="email" name="email" title="Not required"></td></tr>
-				<tr><td><br></td></tr>
-				<tr><td></td><td class="right"><input type="submit" value="Schedule Stream" name="schedule"></td></tr>
-				<tr><td><br></td></tr>
-				<tr><td align=center colspan="2" id="response"></td></tr>
-			</form>
-		</table>
+		<h1>Stream Upload</h1>
+		<div class="user"><p>User: <b>'.$user.'</b></p>
+			<form action="check.php" method="post">
+				<input id="logoff" type="submit" name="logoff" value="Logoff">
+			</form></div>
+		<form action="upload.php" method="post" enctype="multipart/form-data" onsubmit="respond()">
+			<select name="target" id="target" required>
+				<option value="" disabled selected hidden>Streaming Destination</option>
+				<option value="Restream">Restream</option>
+				<option value="Facebook">Facebook</option>
+				<option value="YouTube">YouTube</option>
+			</select>
+			<input type="text" name="streamkey" placeholder="Stream Key" required title="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">
+			<input type="email" name="email" placeholder="Email to notify" title="Not required">
+			<input type="submit" value="Schedule Stream" name="schedule">
+			<p id="response"></p>
+		</form>
 	</div>
 </div>');
 ?>
diff --git a/uploadpage/login.php b/uploadpage/login.php
index 9f3005b..e7aacac 100755
--- a/uploadpage/login.php
+++ b/uploadpage/login.php
@@ -27,19 +27,17 @@ print('<!DOCTYPE html>
 <link rel="stylesheet" href="page.css">
 <div class="container">
 	<div class="incontainer">
-		<table class="single">
-			<tr><td align="center"><h1>Stream Upload</h1></td></tr>');
+		<h1>Stream Upload</h1>');
 if(isset($_POST['login'])){
 	print('
-			<tr><td><h4>Invalid User or Password</h4></td></tr>');
+		<h4>Invalid Username or Password</h4>');
 }
 print('
-			<form action="login.php" method="post">
-				<tr><td><input type="text" name="user" placeholder="Username" required title="string of 0-9, a-z, A-Z" pattern="[a-zA-Z0-9]+"></td></tr>
-				<tr><td><input type="password" name="password" placeholder="Password" required></td></tr>
-				<tr><td><input type="submit" name="login" value="Login"></td></tr>
-			</form>
-		</table>
+		<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">
+		</form>
 	</div>
 </div>');
 ?>
diff --git a/uploadpage/page.css b/uploadpage/page.css
index 8550e3f..0730f81 100755
--- a/uploadpage/page.css
+++ b/uploadpage/page.css
@@ -1,4 +1,5 @@
 input,select {
+	text-align:center;
 	width:100%;
 	padding:12px 20px;
 	margin:0;
@@ -10,6 +11,7 @@ input,select {
 }
 
 input[type=submit] {
+	text-align:center;
 	width:100%;
 	background-color:#4CAF50;
 	color:white;
@@ -33,34 +35,23 @@ body {
 	height:100vh;
 }
 .incontainer {
-	width:550px;
-	max-width:550px;
+	width:325px;
+	max-width:325px;
 }
-p {
-	flex-wrap:nowrap;
+h1 {
+	text-align:center;
 }
 h4 {
 	text-align:center;
-	color:red;
-	background-color:light-red;
+	color:white;
+	background-color:red;
 	padding:.7em;
 }
-table {
+.user {
+	display:flex;
 	width:100%;
+	justify-content:space-between;
 }
-.single {
-	margin:auto;
-	width:325px;
-}
-.left {
-	width:225px;
-	padding-right:10px;
-	text-align:right;
-}
-.right {
-	width:325px;
-}
-.shiftleft {
-	position:relative;
-	left:-95px;
+#logoff {
+	width:100px;
 }

	Stream Upload
User:	'.$user.'
Target:	- -
Streamkey:
Date & Time:
Video File:
Notify email: