diff --git a/js/components/ascribe_forms/form.js b/js/components/ascribe_forms/form.js
index e1a81eab..403100c8 100644
--- a/js/components/ascribe_forms/form.js
+++ b/js/components/ascribe_forms/form.js
@@ -92,7 +92,14 @@ let Form = React.createClass({
         this.setState({errors: []});
     },
     getButtons() {
+        if (this.state.submitted){
+            return this.props.spinner;
+        }
+        if (this.props.buttons){
+            return this.props.buttons;
+        }
         let buttons = null;
+
         if (this.state.edited){
             buttons = (
                 <div className="pull-right">
@@ -122,10 +129,12 @@ let Form = React.createClass({
         });
     },
     render() {
+
         return (
             <form role="form" className="ascribe-form" onSubmit={this.submit} autoComplete="on">
                 {this.getErrors()}
                 {this.renderChildren()}
+                {this.getButtons()}
             </form>
 
         );
diff --git a/js/components/header.js b/js/components/header.js
index 15983e46..583802dd 100644
--- a/js/components/header.js
+++ b/js/components/header.js
@@ -10,14 +10,12 @@ import Alt from '../alt';
 
 import Nav from 'react-bootstrap/lib/Nav';
 import Navbar from 'react-bootstrap/lib/Navbar';
-import NavItem from 'react-bootstrap/lib/NavItem';
+import CollapsibleNav from 'react-bootstrap/lib/CollapsibleNav';
 import DropdownButton from 'react-bootstrap/lib/DropdownButton';
 import MenuItem from 'react-bootstrap/lib/MenuItem';
 import MenuItemLink from 'react-router-bootstrap/lib/MenuItemLink';
 import NavItemLink from 'react-router-bootstrap/lib/NavItemLink';
 
-import SignupModal from '../components/ascribe_modal/modal_signup';
-
 
 import { getLangText } from '../utils/lang_utils';
 
@@ -52,33 +50,33 @@ let Header = React.createClass({
         if (this.state.currentUser.username){
             account = (
                 <DropdownButton eventKey="1" title={this.state.currentUser.username}>
-                        <MenuItemLink to="settings">{getLangText('Account Settings')}</MenuItemLink>
-                        <li className="divider"></li>
-                        <MenuItem eventKey="2" href="/art/faq/">{getLangText('FAQ')}</MenuItem>
-                        <MenuItem eventKey="3" href="/art/terms/">{getLangText('Terms of Service')}</MenuItem>
-                        <MenuItem divider />
-                        <MenuItem eventKey="4" onClick={this.handleLogout}>{getLangText('Log out')}</MenuItem>
+                    <MenuItemLink to="settings">{getLangText('Account Settings')}</MenuItemLink>
+                    <li className="divider"></li>
+                    <MenuItem eventKey="2" href="/art/faq/">{getLangText('FAQ')}</MenuItem>
+                    <MenuItem eventKey="3" href="/art/terms/">{getLangText('Terms of Service')}</MenuItem>
+                    <MenuItem divider />
+                    <MenuItem eventKey="4" onClick={this.handleLogout}>{getLangText('Log out')}</MenuItem>
                   </DropdownButton>
             );
         }
         else {
             account = <NavItemLink to="login">LOGIN</NavItemLink>;
-            signup = (
-                <SignupModal
-                    button={<NavItem to="pieces">SIGNUP</NavItem>} />);
+            signup = <NavItemLink to="signup">SIGNUP</NavItemLink>;
         }
-        return (
-            <Navbar>
-                <Nav>
-                    <Link className="navbar-brand" to="pieces" path="/?page=1">
+        let brand = (<Link className="navbar-brand" to="pieces" path="/?page=1">
                         <span>ascribe </span>
                         <span className="glyph-ascribe-spool-chunked ascribe-color"></span>
-                    </Link>
-                </Nav>
-                <Nav right>
-                    {account}
-                    {signup}
-                </Nav>
+                    </Link>);
+        return (
+
+            <Navbar brand={brand} toggleNavKey={0}>
+                <CollapsibleNav eventKey={0}>
+                    <Nav navbar />
+                    <Nav navbar right>
+                        {account}
+                        {signup}
+                    </Nav>
+                </CollapsibleNav>
             </Navbar>
         );
     }
diff --git a/js/components/login_container.js b/js/components/login_container.js
index 97e8befb..fcdf6523 100644
--- a/js/components/login_container.js
+++ b/js/components/login_container.js
@@ -3,9 +3,6 @@
 import React from 'react';
 import Router from 'react-router';
 
-import UserActions from '../actions/user_actions';
-import UserStore from '../stores/user_store';
-
 import GlobalNotificationModel from '../models/global_notification_model';
 import GlobalNotificationActions from '../actions/global_notification_actions';
 
@@ -47,7 +44,16 @@ let LoginForm = React.createClass({
         return (
             <Form
                 url={apiUrls.users_login}
-                handleSuccess={this.handleSuccess}>
+                handleSuccess={this.handleSuccess}
+                buttons={
+                    <button type="submit" className="btn ascribe-btn ascribe-btn-login">
+                        Log in to ascribe
+                    </button>}
+                spinner={
+                    <button className="btn ascribe-btn ascribe-btn-login ascribe-btn-login-spinner">
+                        <img src="https://s3-us-west-2.amazonaws.com/ascribe0/media/thumbnails/ascribe_animated_medium.gif" />
+                    </button>
+                    }>
                 <Property
                     name='email'
                     label="Email">
@@ -71,9 +77,6 @@ let LoginForm = React.createClass({
                     Not an ascribe user&#63; Sign up...<br/>
                     Forgot my password&#63; Rescue me...
                 </div>
-                <button type="submit" className="btn ascribe-btn ascribe-btn-login">
-                    Log in to ascribe
-                </button>
             </Form>
         );
     }
diff --git a/js/components/register_piece.js b/js/components/register_piece.js
index d420d32b..3a3520b5 100644
--- a/js/components/register_piece.js
+++ b/js/components/register_piece.js
@@ -5,74 +5,149 @@ import React from 'react';
 import AppConstants from '../constants/application_constants';
 import fineUploader from 'fineUploader';
 
+import Router from 'react-router';
+
+import GlobalNotificationModel from '../models/global_notification_model';
+import GlobalNotificationActions from '../actions/global_notification_actions';
+
+import Form from './ascribe_forms/form';
+import Property from './ascribe_forms/property';
+
+import apiUrls from '../constants/api_urls';
+
 import ReactS3FineUploader from 'ReactS3FineUploader';
 
 let RegisterPiece = React.createClass( {
     render() {
 
         return (
-
-            <div>
-                <ReactS3FineUploader
-                    keyRoutine={{
-                        url: AppConstants.serverUrl + 's3/key/',
-                        fileClass: 'digitalwork'
-                    }}
-                    autoUpload={true}
-                    debug={false}
-                    objectProperties={{
-                        acl: 'public-read',
-                        bucket: 'ascribe0'
-                    }}
-                    request={{
-                        endpoint: 'https://ascribe0.s3.amazonaws.com',
-                        accessKey: 'AKIAIVCZJ33WSCBQ3QDA'
-                    }}
-                    signature={{
-                        endpoint: AppConstants.serverUrl + 's3/signature/'
-                    }}
-                    uploadSuccess={{
-                        params: {
-                            isBrowserPreviewCapable: fineUploader.supportedFeatures.imagePreviews
-                        }
-                    }}
-                    cors={{
-                        expected: true
-                    }}
-                    chunking={{
-                        enabled: true
-                    }}
-                    resume={{
-                        enabled: true
-                    }}
-                    retry={{
-                        enableAuto: false
-                    }}
-                    deleteFile={{
-                        enabled: true,
-                        method: 'DELETE',
-                        endpoint: AppConstants.serverUrl + 's3/delete'
-                    }}
-                    validation={{
-                        itemLimit: 100000,
-                        sizeLimit: '25000000000'
-                    }}
-                    session={{
-                        endpoint: null
-                    }}
-                    messages={{
-                        unsupportedBrowser: '<h3>Upload is not functional in IE7 as IE7 has no support for CORS!</h3>'
-                    }}
-                    formatFileName={(name) => {// fix maybe
-                        if (name !== undefined && name.length > 26) {
-                            name = name.slice(0, 15) + '...' + name.slice(-15);
-                        }
-                        return name;
-                    }}
-                    multiple={true}/>
+            <div className="row ascribe-row">
+                <div className="col-md-6">
+                    <FileUploader />
                 </div>
+                <div className="col-md-6">
+                    <LoginForm />
+                </div>
+            </div>
         );
     }
 });
 
+
+let FileUploader = React.createClass( {
+    render() {
+
+        return (
+            <ReactS3FineUploader
+                keyRoutine={{
+                    url: AppConstants.serverUrl + 's3/key/',
+                    fileClass: 'digitalwork'
+                }}
+                autoUpload={true}
+                debug={false}
+                objectProperties={{
+                    acl: 'public-read',
+                    bucket: 'ascribe0'
+                }}
+                request={{
+                    endpoint: 'https://ascribe0.s3.amazonaws.com',
+                    accessKey: 'AKIAIVCZJ33WSCBQ3QDA'
+                }}
+                signature={{
+                    endpoint: AppConstants.serverUrl + 's3/signature/'
+                }}
+                uploadSuccess={{
+                    params: {
+                        isBrowserPreviewCapable: fineUploader.supportedFeatures.imagePreviews
+                    }
+                }}
+                cors={{
+                    expected: true
+                }}
+                chunking={{
+                    enabled: true
+                }}
+                resume={{
+                    enabled: true
+                }}
+                retry={{
+                    enableAuto: false
+                }}
+                deleteFile={{
+                    enabled: true,
+                    method: 'DELETE',
+                    endpoint: AppConstants.serverUrl + 's3/delete'
+                }}
+                validation={{
+                    itemLimit: 100000,
+                    sizeLimit: '25000000000'
+                }}
+                session={{
+                    endpoint: null
+                }}
+                messages={{
+                    unsupportedBrowser: '<h3>Upload is not functional in IE7 as IE7 has no support for CORS!</h3>'
+                }}
+                formatFileName={(name) => {// fix maybe
+                    if (name !== undefined && name.length > 26) {
+                        name = name.slice(0, 15) + '...' + name.slice(-15);
+                    }
+                    return name;
+                }}
+                multiple={true}/>
+        );
+    }
+});
+
+let LoginForm = React.createClass({
+    mixins: [Router.Navigation],
+
+
+    handleSuccess(){
+        let notification = new GlobalNotificationModel('Login successsful', 'success', 10000);
+        GlobalNotificationActions.appendGlobalNotification(notification);
+        this.transitionTo('pieces');
+
+    },
+    render() {
+        return (
+            <Form
+                url={apiUrls.users_login}
+                handleSuccess={this.handleSuccess}
+                buttons={
+                    <button type="submit" className="btn ascribe-btn ascribe-btn-login">
+                        Log in to ascribe
+                    </button>}
+                spinner={
+                    <button className="btn ascribe-btn ascribe-btn-login ascribe-btn-login-spinner">
+                        <img src="https://s3-us-west-2.amazonaws.com/ascribe0/media/thumbnails/ascribe_animated_medium.gif" />
+                    </button>
+                    }>
+                <Property
+                    name='email'
+                    label="Email">
+                    <input
+                        type="email"
+                        placeholder="Enter your email"
+                        autoComplete="on"
+                        required/>
+                </Property>
+                <Property
+                    name='password'
+                    label="Password">
+                    <input
+                        type="password"
+                        placeholder="Enter your password"
+                        autoComplete="on"
+                        required/>
+                </Property>
+                <hr />
+                <div className="ascribe-login-text">
+                    Not an ascribe user&#63; Sign up...<br/>
+                    Forgot my password&#63; Rescue me...
+                </div>
+            </Form>
+        );
+    }
+});
 export default RegisterPiece;
diff --git a/js/components/signup_container.js b/js/components/signup_container.js
index 82ca0714..b8849669 100644
--- a/js/components/signup_container.js
+++ b/js/components/signup_container.js
@@ -14,31 +14,54 @@ import InputCheckbox from './ascribe_forms/input_checkbox';
 import apiUrls from '../constants/api_urls';
 
 
-let LoginContainer = React.createClass({
+let SignupContainer = React.createClass({
     mixins: [Router.Navigation],
 
+    getInitialState(){
+        return ({
+            submitted: false,
+            message: null
+        });
+    },
+    handleSuccess(message){
+        this.setState({
+            submitted: true,
+            message: message
+        });
+    },
     render() {
+        if (this.state.submitted){
+            return (
+                <div className="ascribe-login-wrapper">
+                    <br/>
+                    <div className="ascribe-login-text ascribe-login-header">
+                    {this.state.message}
+                    </div>
+                </div>
+            );
+        }
         return (
             <div className="ascribe-login-wrapper">
                 <br/>
                 <div className="ascribe-login-text ascribe-login-header">
                     Welcome to ascribe...
                 </div>
-                <LoginForm />
+                <SignupForm handleSuccess={this.handleSuccess}/>
             </div>
         );
     }
 });
 
 
-let LoginForm = React.createClass({
+let SignupForm = React.createClass({
     mixins: [Router.Navigation],
 
+    handleSuccess(response){
 
-    handleSuccess(){
-        let notification = new GlobalNotificationModel('Login successsful', 'success', 10000);
+        let notificationText = 'Sign up successful';
+        let notification = new GlobalNotificationModel(notificationText, 'success', 50000);
         GlobalNotificationActions.appendGlobalNotification(notification);
-        this.transitionTo('pieces');
+        this.props.handleSuccess('We sent an email to your address ' + response.user.email + ', please confirm.');
 
     },
     render() {
@@ -47,8 +70,18 @@ let LoginForm = React.createClass({
             'Store it in a safe place!';
         return (
             <Form
-                url={apiUrls.users_login}
-                handleSuccess={this.handleSuccess}>
+                ref='form'
+                url={apiUrls.users_signup}
+                handleSuccess={this.handleSuccess}
+                buttons={
+                    <button type="submit" className="btn ascribe-btn ascribe-btn-login">
+                        Sign up to ascribe
+                    </button>}
+                spinner={
+                    <button className="btn ascribe-btn ascribe-btn-login ascribe-btn-login-spinner">
+                        <img src="https://s3-us-west-2.amazonaws.com/ascribe0/media/thumbnails/ascribe_animated_medium.gif" />
+                    </button>
+                    }>
                 <Property
                     name='email'
                     label="Email">
@@ -58,15 +91,6 @@ let LoginForm = React.createClass({
                         autoComplete="on"
                         required/>
                 </Property>
-                <Property
-                    name='username'
-                    label="Username">
-                    <input
-                        type="text"
-                        placeholder="Choose a username"
-                        autoComplete="on"
-                        required/>
-                </Property>
                 <Property
                     name='password'
                     label="Password"
@@ -89,26 +113,23 @@ let LoginForm = React.createClass({
                 </Property>
                 <Property
                     name='promo_code'
-                    label="Promocode (Optional)">
+                    label="Promocode">
                     <input
                         type="password"
-                        placeholder="Enter a promocode here"/>
+                        placeholder="Enter a promocode here (Optional)"/>
                 </Property>
+                <hr />
                 <InputCheckbox
-                    ref="terms"
+                    name='terms'
                     required="required"
                     label={
                         <div>
                             I agree to the&nbsp;
                             <a href="/terms" target="_blank"> Terms of Service</a>
                         </div>}/>
-                <hr />
-                <button type="submit" className="btn ascribe-btn ascribe-btn-login">
-                    Sign up to ascribe
-                </button>
             </Form>
         );
     }
 });
 
-export default LoginContainer;
\ No newline at end of file
+export default SignupContainer;
\ No newline at end of file
diff --git a/sass/ascribe_login.scss b/sass/ascribe_login.scss
index 956b46a5..861cf594 100644
--- a/sass/ascribe_login.scss
+++ b/sass/ascribe_login.scss
@@ -1,5 +1,6 @@
 $break-small: 764px;
 
+
 .ascribe-btn-login {
   padding: 1.5em;
   font-weight: 500;
@@ -24,6 +25,21 @@ $break-small: 764px;
   }
 }
 
+.ascribe-btn-login-spinner{
+  background-color: rgba(2, 182, 163, 0.4);
+  padding: 0.8em;
+  img {
+    height: 3em;
+  }
+  &:hover {
+    background-color: rgba(2, 182, 163, 0.4);
+  }
+  &:active, &:focus {
+    background-color: rgba(2, 182, 163, 0.4);
+  }
+}
+
+
 .ascribe-login-wrapper {
   width: 80%;
   margin: 0 auto;
diff --git a/sass/ascribe_piece_register.scss b/sass/ascribe_piece_register.scss
new file mode 100644
index 00000000..b24320ae
--- /dev/null
+++ b/sass/ascribe_piece_register.scss
@@ -0,0 +1,7 @@
+$break-small: 764px;
+
+
+.ascribe-row {
+  max-width: 600px;
+  margin: 0 auto
+}
diff --git a/sass/main.scss b/sass/main.scss
index e6cb524a..0507738a 100644
--- a/sass/main.scss
+++ b/sass/main.scss
@@ -18,6 +18,7 @@ $BASE_URL: '<%= BASE_URL %>';
 @import 'ascribe_textarea';
 @import 'ascribe_media_player';
 @import 'ascribe-global-notification';
+@import 'ascribe_piece_register';
 @import 'offset_right';
 @import 'ascribe_settings';
 @import '../node_modules/react-s3-fineuploader/scss/ascribe-theme';
@@ -32,6 +33,7 @@ body {
 }
 
 .navbar-default {
+    border: none;
     border-left:0;
     border-right:0;
     margin-bottom: 1.5em;