diff --git a/public/style.css b/public/style.css
index 9634171d97df3c4946a1860fa92ea0cc919c5201..84789bf8234b2d3ea9ca392cf1f894be4d102936 100644
--- a/public/style.css
+++ b/public/style.css
@@ -217,10 +217,31 @@ table, th, td {
     height: 17px;
     content: "";
 }
+/* Login Page */
+
+.login-input {
+    margin: 5px 0 5px 0;
+}
+
+.login-link {
+    float: right;
+    margin-top: 10px;
+}
 
 /* Register Page */
 
+#sign-up-btn {
+    float: right;
+}
 
+.register-link {
+    float: left;
+    margin-top: 8px;
+}
+
+.checkbox {
+    margin: 10px 0 10px 0;
+}
 
 .available {
     background-color: greenyellow;
diff --git a/src/view/login.php b/src/view/login.php
index 935497c52cd5e8e586e51e03bd623db508f021a5..ac51ce26555ab0cb859ca1d0a5f6752284d712e1 100644
--- a/src/view/login.php
+++ b/src/view/login.php
@@ -21,13 +21,13 @@
                 <fieldset>
                     <legend>Login:</legend>
                     Username: <br>
-                    <input type="text" placeholder="Username" name="username">
+                    <input class="login-input" type="text" placeholder="Username" name="username">
                     <br>
                     Password: <br>
-                    <input type="password" placeholder="Password" name="password">
+                    <input class="login-input" type="password" placeholder="Password" name="password">
                     <br>
-                    <input class="btn" type="submit" value="Login">
-                    <a href="/index.php/register">Don't have an account?</a>
+                    <input class="btn login-input" type="submit" value="Login">
+                    <a class="login-link" href="/index.php/register">Don't have an account?</a>
                     <br>
                 </fieldset>
             </form>
diff --git a/src/view/register.php b/src/view/register.php
index 13f9e42c12d5f7b7fdc160a040fea2c2673077ad..e2205db1d5cd5ea11b36ff3cd7b2efb6ec4d29b8 100644
--- a/src/view/register.php
+++ b/src/view/register.php
@@ -13,10 +13,10 @@
     </div>
 
     <div class="row">
-        <div class="col-1">
+        <div class="col-2">
 
         </div>
-        <div class="col-4">
+        <div class="col-2">
             <form id="register-form" method="post" action="/index.php/register">
                 <fieldset>
                     <legend>Sign Up</legend>
@@ -70,14 +70,15 @@
                             </td>
                         </tr>
                     </table>
-                    <input type="checkbox" value="is-driver" name="is_driver"> I want to be a driver as well!
+                    <input class="checkbox" id="driver-ckbox" type="checkbox" value="is-driver" name="is_driver"> I want to be a driver as well!
                     <br>
-                    <input id="sign-up-btn" type="submit" value="Sign up" disabled>
+                    <a class="register-link" href="/index.php/login">Already have an account?</a>
+                    <input class="btn" id="sign-up-btn" type="submit" value="Sign up" disabled>
                     <br>
                 </fieldset>
             </form>
         </div>
-        <div class="col-1">
+        <div class="col-2">
 
         </div>
     </div>