diff --git a/client/src/pages/SignUpForm.js b/client/src/pages/SignUpForm.js
index 48636c6..5492dfd 100644
--- a/client/src/pages/SignUpForm.js
+++ b/client/src/pages/SignUpForm.js
@@ -1,67 +1,108 @@
 import React, { Component } from 'react';
 import { Link } from 'react-router-dom';
+import IconButton from '@material-ui/core/IconButton';
+import VisibilityOffIcon from '@material-ui/icons/VisibilityOff';
+import VisibilityIcon from '@material-ui/icons/Visibility';
+
 
 class SignUpForm extends Component {
-    constructor() {
-        super();
+  constructor() {
+    super();
 
-        this.state = {
-            email: '',
-            password: '',
-            name: '',
-            hasAgreed: false
-        };
+    this.state = {
+      email: '',
+      password: '',
+      name: '',
+      hasAgreed: false,
+      disabledButtonColor: '#9fcfff',
+      disabledTextColor: '#808080',
+      type: 'password',
+      Icon: <VisibilityOffIcon />
+    };
 
-        this.handleChange = this.handleChange.bind(this);
-        this.handleSubmit = this.handleSubmit.bind(this);
-    }
+    this.handleChange = this.handleChange.bind(this);
+    this.handleSubmit = this.handleSubmit.bind(this);
+  }
 
-    handleChange(e) {
-        let target = e.target;
-        let value = target.type === 'checkbox' ? target.checked : target.value;
-        let name = target.name;
+  handleChange(e) {
+    let target = e.target;
+    let value = target.type === 'checkbox' ? target.checked : target.value;
+    let name = target.name;
 
-        this.setState({
-          [name]: value
-        });
-    }
+    this.setState({
+      [name]: value
+    });
+  }
+
+  handleClick = () => this.setState(({ type }) => ({
+    Icon: type === 'text' ? <VisibilityOffIcon /> : <VisibilityIcon />,
+    type: type === 'text' ? 'password' : 'text'
+
+  }))
 
-    handleSubmit(e) {
-        e.preventDefault();
+  handleSubmit(e) {
+    e.preventDefault();
 
-        console.log('The form was submitted with the following data:');
-        console.log(this.state);
+    console.log('The form was submitted with the following data:');
+    console.log(this.state);
+  }
+
+  render() {
+
+    let content = null;
+    if (this.state.email.length && this.state.password.length && this.state.name.length && this.state.hasAgreed) {
+      content = <button className="FormField__Button mr-20"
+        onClick={() => { console.log(this.state.isValid) }}
+      >Sign Up</button>
+    }
+    else {
+      content = <button className="FormField__Button mr-20"
+        style={
+          {
+            backgroundColor: this.state.disabledButtonColor,
+            color: this.state.disabledTextColor
+          }
+        }
+        disabled
+      >Sign Up</button>
     }
 
-    render() {
-        return (
+    return (
+      <div className="container">
         <div className="FormCenter">
-            <form onSubmit={this.handleSubmit} className="FormFields">
-              <div className="FormField">
-                <label className="FormField__Label" htmlFor="name">Full Name</label>
-                <input type="text" id="name" className="FormField__Input" placeholder="Enter your full name" name="name" value={this.state.name} onChange={this.handleChange} />
-              </div>
+          <form onSubmit={this.handleSubmit} className="FormFields">
+            <div className="FormField">
+              <label className="FormField__Label" htmlFor="name">Full Name</label>
+              <input type="text" id="name" className="FormField__Input" placeholder="Enter your full name" name="name" value={this.state.name} onChange={this.handleChange} />
+            </div>
+            <div style={{ flexDirection: 'row', display: 'flex' }}>
               <div className="FormField">
                 <label className="FormField__Label" htmlFor="password">Password</label>
-                <input type="password" id="password" className="FormField__Input" placeholder="Enter your password" name="password" value={this.state.password} onChange={this.handleChange} />
-              </div>
-              <div className="FormField">
-                <label className="FormField__Label" htmlFor="email">E-Mail Address</label>
-                <input type="email" id="email" className="FormField__Input" placeholder="Enter your email" name="email" value={this.state.email} onChange={this.handleChange} />
+                <input type="password" id="password" className="FormField__Input" placeholder="Enter your password" name="password" value={this.state.password} onChange={this.handleChange} type={this.state.type} />
               </div>
+              <IconButton aria-label="info" onClick={this.handleClick}>
+                {this.state.Icon}
+              </IconButton>
+            </div>
+            <div className="FormField">
+              <label className="FormField__Label" htmlFor="email">E-Mail Address</label>
+              <input type="email" id="email" className="FormField__Input" placeholder="Enter your email" name="email" value={this.state.email} onChange={this.handleChange} />
+            </div>
 
-              <div className="FormField">
-                <label className="FormField__CheckboxLabel">
-                    <input className="FormField__Checkbox" type="checkbox" name="hasAgreed" value={this.state.hasAgreed} onChange={this.handleChange} /> I agree all statements in <a href="" className="FormField__TermsLink">terms of service</a>
-                </label>
-              </div>
+            <div className="FormField">
+              <label className="FormField__CheckboxLabel">
+                <input className="FormField__Checkbox" type="checkbox" name="hasAgreed" value={this.state.hasAgreed} onChange={this.handleChange} /> I agree all statements in <a href="" className="FormField__TermsLink">terms of service</a>
+              </label>
+            </div>
 
-              <div className="FormField">
-                  <button className="FormField__Button mr-20">Sign Up</button> <Link to="/sign-in" className="FormField__Link">I'm already member</Link>
-              </div>
-            </form>
-          </div>
-        );
-    }
+            <div className="FormField">
+              {content}
+              <Link to="/sign-in" className="FormField__Link">I'm already member</Link>
+            </div>
+          </form>
+        </div>
+      </div>
+    );
+  }
 }
 export default SignUpForm;
\ No newline at end of file