diff --git a/client/stylesheets/assets/css/bootstrap.css b/client/stylesheets/assets/css/bootstrap.css
index 6e0689a..48af6a7 100644
--- a/client/stylesheets/assets/css/bootstrap.css
+++ b/client/stylesheets/assets/css/bootstrap.css
@@ -1090,7 +1090,7 @@ body {
   font-size: 13px;
   line-height: 1.5384616;
   color: #333333;
-  background-color: #eeeded;
+  background-color: White;
 }
 input,
 button,
diff --git a/imports/client/views/nonOrg/enter/SignupView.js b/imports/client/views/nonOrg/enter/SignupView.js
index fce0b97..1d86f81 100644
--- a/imports/client/views/nonOrg/enter/SignupView.js
+++ b/imports/client/views/nonOrg/enter/SignupView.js
@@ -5,7 +5,7 @@ import { Row, Col, FormGroup,
   InputGroup, Button }                    from 'react-bootstrap';
 import handleSignup                       from './signup';
 import { Orgs }                           from '/imports/collections/orgs/index';
-import './signup.css'
+import './signup.css';
 
 export default class Signup extends React.Component {
   constructor(props) {
@@ -40,22 +40,22 @@ export default class Signup extends React.Component {
     return (
       <div className="Signup">
         <Row>
-          <Col xs={ 12 } sm={ 6 } md={ 4 }>
+          <Col  md={ 12 }>
             <h4 className="page-header">Sign Up</h4>
             <form
               ref={ form => (this.signupForm = form) }
               onSubmit={ this.handleSubmit }
             >
             <Row>
-            <Col xs={ 12 } sm={ 12 }>
+            <Col xs={ 10 } sm={ 10 }>
               <FormGroup controlId="orgSlugField" validationState={this.checkExistingOrgSlug()}>
-                <ControlLabel>Organisation name</ControlLabel>
+                <ControlLabel>Organisation URL</ControlLabel>
                 <InputGroup>
                   <FormControl
                     type        ="text"
                     ref         ="orgSlug"
                     name        ="orgSlug"
-                    placeholder ="School URL"
+                    placeholder ="Organisation URL"
                     onChange    = {(e) => this.handleChange(e)}
                   />
                   <InputGroup.Addon>@yd.com</InputGroup.Addon>
@@ -66,12 +66,12 @@ export default class Signup extends React.Component {
             <Row>
               <Col xs={ 6 } sm={ 6 }>
                 <FormGroup>
-                  <ControlLabel>First Name</ControlLabel>
+                  <ControlLabel>Organisation Name</ControlLabel>
                   <FormControl
                     type="text"
                     ref="orgName"
                     name="orgName"
-                    placeholder="School Name"
+                    placeholder="Organisation Name"
                   />
                   </FormGroup>
               </Col>
@@ -118,10 +118,10 @@ export default class Signup extends React.Component {
                   placeholder="Password"
                 />
               </FormGroup>
-              <Button type="submit" bsStyle="success">Sign Up</Button>
+              <Col md={12}
+              <Button type="submit" className='bheader' bsStyle="success">Sign Up</Button></Col>
             </form>
-            <p>Already have an account? <Link to="/login">Log In</Link>.</p>
-          </Col>
+            </Col>
         </Row>
       </div>
     );
diff --git a/imports/client/views/nonOrg/enter/signup.css b/imports/client/views/nonOrg/enter/signup.css
index 9869375..9273673 100644
--- a/imports/client/views/nonOrg/enter/signup.css
+++ b/imports/client/views/nonOrg/enter/signup.css
@@ -1,5 +1,13 @@
-.Signup .row div{
-  display: block;
-    margin: auto;
-    left: 27%;
+.Signup
+{
+  background-color: white;
+  margin: auto;
+   width: 40%;
+   border: 3px solid #73AD21;
+   padding: 10px;
+}
+
+.page-header .bheader
+{
+  text-align: center;
 }
diff --git a/imports/client/views/org/enter/LoginPane.js b/imports/client/views/org/enter/LoginPane.js
index 729f8d0..56ff8a0 100644
--- a/imports/client/views/org/enter/LoginPane.js
+++ b/imports/client/views/org/enter/LoginPane.js
@@ -7,14 +7,16 @@ import { Alert }                          from 'reactstrap';
 import 'velocity-animate';
 import 'velocity-animate/velocity.ui';
 import { VelocityComponent, VelocityTransitionGroup, velocityHelpers } from 'velocity-react';
+import './loginpane.css';
 import ReactSVG                           from 'react-svg'
 
 
+
 export class LoginPane extends React.Component {
 
   render() {
     return (
-      <Col lg={{ size: 6, pull: 2, push: 2, offset: 1 }} md={{ size: 9, pull: 1, push: 1 }} sm={{ size: 10, push: 1, pull: 1 }}>
+      <Col  md={12} >
         <VelocityTransitionGroup enter={{ animation: "transition.slideRightIn"}} leave={{animation: "transition.fadeOut" }} runOnMount={true}>
           <div className="enterPane__centerVerticallyWrapper">
             <Link
@@ -35,6 +37,7 @@ export class LoginPane extends React.Component {
                 { this.props.data.message }
               </Alert>
               <Form onSubmit={ (e) => this.props.onLogin(e) }>
+                <Col md={12}>
                 <FormGroup>
                   <Input type="email" size="lg"
                       value={ this.props.data.email }
@@ -42,7 +45,8 @@ export class LoginPane extends React.Component {
                       name="email"
                       id="email"
                       placeholder="Enter your email" />
-                </FormGroup>
+                </FormGroup></Col>
+                <Col md={12}>
                 <FormGroup>
                   <Input type="password" size="lg"
                          value={ this.props.data.password }
@@ -51,17 +55,20 @@ export class LoginPane extends React.Component {
                          id="password"
                          placeholder="Enter your password" />
                 </FormGroup>
+              </Col>
+              <Col md={12}>
                 <FormGroup>
                   <ActionButton
                     loading={ this.props.data.loading }>
                     <Button
-                        color="success" size="lg"
+                        color="success" size="sm"
                         type="submit"
                         block>
                       Log in
                     </Button>
                   </ActionButton>
                 </FormGroup>
+              </Col>
                 <FormGroup className="enterPane__formGroupLogin--center">
                   <Link className="enterPane__link"
                     to={ setQueryParam(this.props.location, { enter: 'forgot' }) }>
diff --git a/imports/client/views/org/enter/loginpane.css b/imports/client/views/org/enter/loginpane.css
new file mode 100644
index 0000000..4c58b9b
--- /dev/null
+++ b/imports/client/views/org/enter/loginpane.css
@@ -0,0 +1,12 @@
+.enterPane__box{
+background-color: white;
+margin: auto;
+ width: 30%;
+ border: 3px solid #73AD21;
+ padding: 10px;
+ }
+
+ .enterPane__header{
+   text-align: center;
+   font-weight: bold;
+ }
diff --git a/public/css/assets/css/bootstrap.css b/public/css/assets/css/bootstrap.css
index 6e0689a..117daa2 100644
--- a/public/css/assets/css/bootstrap.css
+++ b/public/css/assets/css/bootstrap.css
@@ -1090,7 +1090,7 @@ body {
   font-size: 13px;
   line-height: 1.5384616;
   color: #333333;
-  background-color: #eeeded;
+  background-color: white;
 }
 input,
 button,