diff --git a/views/login.jade b/views/login.jade
index 54f9060208..2e1fb752dd 100644
--- a/views/login.jade
+++ b/views/login.jade
@@ -4,30 +4,29 @@ block content
   if message
     p= message
 
-  .row
-    .main
-      h3
-        | Please Login, or 
-        a(href='/signup') Sign Up
-      .row
-        .col-xs-6.col-sm-6.col-md-6
-          a.btn.btn-lg.btn-primary.btn-block(href='#') Facebook
-        .col-xs-6.col-sm-6.col-md-6
-          a.btn.btn-lg.btn-info.btn-block(href='#') Google
-      .login-or
-        hr.hr-or
-        span.span-or or
-      form(role='form')
-        .form-group
-          label(for='inputUsernameEmail') Username or email
-          input#inputUsernameEmail.form-control(type='text')
-        .form-group
-          a.pull-right(href='#') Forgot password?
-          label(for='inputPassword') Password
-          input#inputPassword.form-control(type='password')
-        .checkbox.pull-right
-          label
-            input(type='checkbox')
-            | Remember me
-        button.btn.btn.btn-primary(type='submit')
-          | Log In
\ No newline at end of file
+  .main
+    h3
+      | Please Login, or 
+      a(href='/signup') Sign Up
+    .row
+      .col-xs-6.col-sm-6.col-md-6
+        a.btn.btn-lg.btn-primary.btn-block(href='#') Facebook
+      .col-xs-6.col-sm-6.col-md-6
+        a.btn.btn-lg.btn-info.btn-block(href='#') Google
+    .login-or
+      hr.hr-or
+      span.span-or or
+    form(role='form')
+      .form-group
+        label(for='inputUsernameEmail') Username or email
+        input#inputUsernameEmail.form-control(type='text')
+      .form-group
+        a.pull-right(href='#') Forgot password?
+        label(for='inputPassword') Password
+        input#inputPassword.form-control(type='password')
+      .checkbox.pull-right
+        label
+          input(type='checkbox')
+          | Remember me
+      button.btn.btn.btn-primary(type='submit')
+        | Log In
\ No newline at end of file
diff --git a/views/signup.jade b/views/signup.jade
index 390e69a64a..83e226cf19 100644
--- a/views/signup.jade
+++ b/views/signup.jade
@@ -4,15 +4,24 @@ block content
   if message
     p= message
 
-  form(action='/login', method='post')
-    div
-      label Username:
-      input(type='text', name='username')
-      br
-      div
-        label Password:
-        input(type='password', name='password')
-      div
-        input(type='submit', value='Submit')
-    p
-      small Hint - bob:secret
+  .main
+    h3 Signup Form
+    form(role='form')
+      .form-group
+        .row
+          .col-xs-6.col-md-6
+            label(for='inputUsernameEmail') First Name
+            input.form-control(name='firstname', type='text', required='', autofocus='')
+          .col-xs-6.col-md-6
+            label(for='inputUsernameEmail') Last Name
+            input.form-control(name='lastname', type='text', required='')
+      .form-group
+        label(for='inputUsernameEmail') Email
+        input#inputUsernameEmail.form-control(type='text')
+      .form-group
+        label(for='inputPassword') Password
+        input#inputPassword.form-control(type='password')
+      .form-group
+        label(for='inputPassword') Confirm Password
+        input#inputPassword.form-control(type='password')
+      button.btn.btn.btn-primary(type='submit') Signup
\ No newline at end of file