diff --git a/imports/client/views/nonOrg/NotFound.css b/imports/client/views/nonOrg/NotFound.css
new file mode 100644
index 0000000..36a6abb
--- /dev/null
+++ b/imports/client/views/nonOrg/NotFound.css
@@ -0,0 +1,17 @@
+.NotFound
+{
+ margin: 20px auto;
+ width: 400px;
+ height: auto;
+ padding: 20px;
+ -webkit-border-radius: 8px/7px;
+ -moz-border-radius: 8px/7px;
+ border-radius: 8px/7px;
+ background-color: white;
+ -webkit-box-shadow: 1px 2px 5px rgba(0,0,0,.31);
+ -moz-box-shadow: 1px 2px 5px rgba(0,0,0,.31);
+ box-shadow: 1px 2px 5px rgba(0,0,0,.31);
+ border: solid 1px #cbc9c9;
+ font-family: 'Ubuntu', sans-serif;
+ color:crimson;
+}
diff --git a/imports/client/views/nonOrg/NotFound.js b/imports/client/views/nonOrg/NotFound.js
index 260a2fb..771eaba 100644
--- a/imports/client/views/nonOrg/NotFound.js
+++ b/imports/client/views/nonOrg/NotFound.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Alert } from 'react-bootstrap';
-
+import 'NotFound.css'
 const NotFound = () => (
   <div className="NotFound">
     <Alert bsStyle="danger">
diff --git a/imports/client/views/org/admin/Sidebar.js b/imports/client/views/org/admin/Sidebar.js
index 3ee7740..1e1fea4 100644
--- a/imports/client/views/org/admin/Sidebar.js
+++ b/imports/client/views/org/admin/Sidebar.js
@@ -32,7 +32,7 @@ export class AdminSidebar extends Component {
               <div className="sidebar-category sidebar-category-visible">
                   <div className="category-content no-padding">
                       <Nav className="navigation navigation-main navigation-accordion">
-                          <NavItem className="navigation-header"><span>#schoolname</span> <i className="icon-menu" title="Main pages"></i></NavItem>
+                          <NavItem className="navigation-header"><span>{org.name}</span> <i className="icon-menu" title="Main pages"></i></NavItem>
                           <NavItem className="active" eventKey={1} href="#"><i className="icon-home4"></i> <span>Dashboard</span></NavItem>
 
                           <NavDropdown eventKey={2} title="Settings" name="Settings" id="setting">
diff --git a/imports/client/views/org/admin/students/AddStudentFormContainer.js b/imports/client/views/org/admin/students/AddStudentFormContainer.js
deleted file mode 100644
index 83f0024..0000000
--- a/imports/client/views/org/admin/students/AddStudentFormContainer.js
+++ /dev/null
@@ -1,96 +0,0 @@
-import React, { Component } from 'react'
-import { AddStudentForm } from './addStudentForm'
-import StudentForm from './StudentForm'
-import Form from '/imports/client/views/core/Form'
-import Validator from '/imports/client/views/core/Validator'
-import { isRequired, isValidEmail } from '/imports/client/views/core/validations'
-import { addStudentManually } from '/imports/collections/students/methods';
-
-export class AddStudentFormContainer extends Component {
-
-  constructor(props) {
-    super(props)
-    this.state = { currentStep: 0 }
-    this.handleNextClick = this.handleNextClick.bind(this)
-    this.handleBackClick = this.handleBackClick.bind(this)
-    this.handleSubmit = this.handleSubmit.bind(this)
-  }
-
-  handleNextClick() {
-    this.form.handleSubmit()
-    if (this.validator.getErrors() && Object.keys(this.validator.getErrors()).length > 0) return
-    this.setState({ currentStep: this.state.currentStep + 1 })
-    this.form.resetSubmitted()
-  }
-
-  handleBackClick() {
-    this.setState({ currentStep: this.state.currentStep + -1 })
-  }
-
-  handleSubmit() {
-    if (this.state.currentStep === 3) {
-      addStudentManually.call(this.form.state.values)
-    }
-  }
-
-  //render callback
-  render() {
-    return (
-      <Form
-        onSubmit={this.handleSubmit}
-        ref={form => this.form = form}
-        initialValues={{
-          gender: 'male',
-          parentGender: 'male',
-        }}
-      >
-        {({ values, setValue, getValue, isSubmitted, isDirty }) => (
-          <Validator
-            values={values}
-            ref={validator => this.validator = validator}
-            validations={{
-              admissionId: [(value) => isRequired('Admission id', value)],
-              firstName: [(value) => isRequired('First name', value)],
-              lastName: [(value) => isRequired('Last name', value)],
-              email: [(value) => isRequired('Email', value), isValidEmail],
-              dob: [(value) => isRequired('Date of birth', value)],
-              gender: [(value) => isRequired('Gender', value)],
-              rollNo: [(value) => this.state.currentStep === 1 && isRequired('Roll no', value)],
-              studentClass: [(value) => this.state.currentStep === 1 && isRequired('Class', value)],
-              section: [(value) => this.state.currentStep === 1 && isRequired('Section', value)],
-              community: [(value) => this.state.currentStep === 1 && isRequired('Community', value)],
-              bloodGroup: [(value) => this.state.currentStep === 1 && isRequired('Blood group', value)],
-              phone: [(value) => this.state.currentStep === 1 && isRequired('Phone', value)],
-              address: [(value) => this.state.currentStep === 2 && isRequired('Address', value)],
-              city: [(value) => this.state.currentStep === 2 && isRequired('City', value)],
-              state: [(value) => this.state.currentStep === 2 && isRequired('State', value)],
-              parentName: [(value) => this.state.currentStep === 3 && isRequired('Parent name', value)],
-              parentEmail: [(value) => this.state.currentStep === 3 && isRequired('Parent email', value), (value) => this.state.currentStep === 3 && isValidEmail(value)],
-              relation: [(value) => this.state.currentStep === 3 && isRequired('Relation', value)],
-              profession: [(value) => this.state.currentStep === 3 && isRequired('Profession', value)],
-              parentGender: [(value) => this.state.currentStep === 3 && isRequired('Parent gender', value)],
-              parentPhone: [(value) => this.state.currentStep === 3 && isRequired('Parent phone', value)],
-              parentAddress: [(value) => this.state.currentStep === 3 && isRequired('Parent address', value)],
-              parentCity: [(value) => this.state.currentStep === 3 && isRequired('Parent city', value)],
-              parentState: [(value) => this.state.currentStep === 3 && isRequired('Parent state', value)],
-              parentZipcode: [(value) => this.state.currentStep === 3 && isRequired('Parent zip code', value)],
-            }}
-          >
-            {({ errors }) => (
-              <StudentForm
-                isDirty={isDirty}
-                setValue={setValue}
-                getValue={getValue}
-                isSubmitted={isSubmitted}
-                errors={errors}
-                onNextClick={this.handleNextClick}
-                onBackClick={this.handleBackClick}
-                currentStep={this.state.currentStep}
-              />
-            )}
-          </Validator>
-        )}
-      </Form>
-    )
-  }
-}
diff --git a/imports/client/views/org/admin/students/FabMenu.js b/imports/client/views/org/admin/students/FabMenu.js
deleted file mode 100644
index aff655a..0000000
--- a/imports/client/views/org/admin/students/FabMenu.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import _                                  from 'lodash';
-import { Meteor }                         from 'meteor/meteor';
-
-import React, { Component }               from 'react';
-import { Link,browserHistory }            from 'react-router';
-import { FormGroup,Panel,Table,
-  ButtonToolbar,Modal,
-  FormControl,Glyphicon,Button }          from 'react-bootstrap';
-import { AddStudentForm }               from './addStudentForm';
-
-const style = {
-  margin: 12,
-};
-export class FabMenuView extends Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      show: false
-    };
-    this.onUpdate = this.onUpdate.bind(this);
-  };
-  onUpdate(key, value) {
-    this.setState({[key]: value});
-  };
-
-  render() {
-    return (
-      <div>
-        <Button bsStyle="primary">Add Student</Button>
-        <Button bsStyle="info">Upload CSV</Button>
-      </div>
-    );
-  };
-
-};
diff --git a/imports/client/views/org/admin/students/StudentForm.js b/imports/client/views/org/admin/students/StudentForm.js
deleted file mode 100644
index 2db920a..0000000
--- a/imports/client/views/org/admin/students/StudentForm.js
+++ /dev/null
@@ -1,485 +0,0 @@
-import React, { PropTypes } from 'react'
-import {
-  Row,
-  Col,
-  FormGroup,
-  FormControl,
-  Button
-} from 'react-bootstrap'
-import DatePicker from '/imports/client/views/core/DatePicker'
-import Label from '/imports/client/views/core/Label'
-import Stepper from '/imports/client/views/core/Stepper'
-import ErrorLabel from '/imports/client/views/core/ErrorLabel'
-
-const StudentForm = props => (
-  <div className="stepy-validation">
-    <Stepper
-      steps={[
-        {
-          label: 'Personal data',
-          active: props.currentStep === 0,
-        },
-        {
-          label: 'Academic',
-          active: props.currentStep === 1,
-        },
-        {
-          label: 'Address',
-          active: props.currentStep === 2,
-        },
-        {
-          label: 'Parent info',
-          active: props.currentStep === 3,
-        }
-      ]}
-    />
-    {props.currentStep === 0 && (
-      <fieldset title="1">
-        <legend className="text-semibold">Personal data</legend>
-        <Row>
-          <Col xs={12} sm={6}>
-            <FormGroup controlId="admissionId">
-              <Label required>Admission Id</Label>
-              <FormControl
-                type="text"
-                value={props.getValue('admissionId')}
-                placeholder="admission Id"
-                onChange={e => props.setValue('admissionId', e.target.value)}
-              />
-              {props.isSubmitted() && props.errors && props.errors.admissionId && (
-                <ErrorLabel> {props.errors.admissionId} </ErrorLabel>
-              )}
-            </FormGroup>
-          </Col>
-          <Col xs={12} sm={6}>
-            <FormGroup controlId="firstName">
-              <Label required>First Name</Label>
-              <FormControl
-                type="text"
-                value={props.getValue('firstName')}
-                placeholder="First Name"
-                onChange={e => props.setValue('firstName', e.target.value)}
-              />
-              {props.isSubmitted() && props.errors && props.errors.firstName && (
-                <ErrorLabel> {props.errors.firstName} </ErrorLabel>
-              )}
-            </FormGroup>
-          </Col>
-        </Row>
-        <Row>
-        <Col xs={12} sm={6}>
-          <FormGroup controlId="lastName">
-            <Label required>Last Name</Label>
-            <FormControl
-              type="text"
-              value={props.getValue('lastName')}
-              placeholder="Last Name"
-              onChange={e => props.setValue('lastName', e.target.value)}
-            />
-            {props.isSubmitted() && props.errors && props.errors.lastName && (
-              <ErrorLabel> {props.errors.lastName} </ErrorLabel>
-            )}
-          </FormGroup>
-        </Col>
-        <Col xs={12} sm={6}>
-          <FormGroup controlId="formControlsSelect">
-            <Label>Gender</Label>
-            <FormControl componentClass="select"
-              placeholder="select"
-              value={props.getValue('gender')}
-              onChange={e => props.setValue('gender', e.target.value)}
-              >
-              <option value="male">Male</option>
-              <option value="female">Female</option>
-            </FormControl>
-            {props.isSubmitted() && props.errors && props.errors.gender && (
-              <ErrorLabel> {props.errors.gender} </ErrorLabel>
-            )}
-          </FormGroup>
-        </Col>
-        </Row>
-        <Row>
-          <Col xs={12} sm={6}>
-            <FormGroup controlId="email">
-              <Label required>Email</Label>
-              <FormControl
-                type="email"
-                value={props.getValue('email')}
-                placeholder="Email"
-                onChange={e => props.setValue('email', e.target.value)}
-              />
-              {props.isSubmitted() && props.errors && props.errors.email && (
-                <ErrorLabel> {props.errors.email} </ErrorLabel>
-              )}
-            </FormGroup>
-          </Col>
-          <Col xs={12} sm={6}>
-            <FormGroup>
-              <Label required>Date of birth</Label>
-              <DatePicker
-                id="dob"
-                setValue = {props.setValue}
-                value={props.getValue('dob')}
-                onChange={(e) => {
-                  props.setValue('dob', e.target.value)
-                }}
-              />
-              {props.isSubmitted() && props.errors && props.errors.dob && (
-                <ErrorLabel> {props.errors.dob} </ErrorLabel>
-              )}
-            </FormGroup>
-          </Col>
-        </Row>
-        <Row>
-
-        </Row>
-      </fieldset>
-    )}
-    {props.currentStep === 1 && (
-      <fieldset title="Academic">
-        <legend className="text-semibold">Academic</legend>
-        <Row>
-          <Col xs={12} sm={6}>
-            <FormGroup controlId="rollNo">
-              <Label required>Roll No</Label>
-              <FormControl
-                type="text"
-                value={props.getValue('rollNo')}
-                placeholder="Roll No"
-                onChange={e => props.setValue('rollNo', e.target.value)}
-              />
-              {props.isSubmitted() && props.errors && props.errors.rollNo && (
-                <ErrorLabel> {props.errors.rollNo} </ErrorLabel>
-              )}
-            </FormGroup>
-          </Col>
-          <Col xs={12} sm={6}>
-            <FormGroup controlId="class">
-              <Label required>Class</Label>
-              <FormControl
-                type="text"
-                value={props.getValue('studentClass')}
-                placeholder="7"
-                onChange={e => props.setValue('studentClass', e.target.value)}
-              />
-              {props.isSubmitted() && props.errors && props.errors.studentClass && (
-                <ErrorLabel> {props.errors.studentClass} </ErrorLabel>
-              )}
-            </FormGroup>
-          </Col>
-        </Row>
-        <Row>
-          <Col xs={12} sm={6}>
-            <FormGroup controlId="section">
-              <Label required>Section</Label>
-              <FormControl
-                type="text"
-                value={props.getValue('section')}
-                placeholder="B"
-                onChange={e => props.setValue('section', e.target.value)}
-              />
-              {props.isSubmitted() && props.errors && props.errors.section && (
-                <ErrorLabel> {props.errors.section} </ErrorLabel>
-              )}
-            </FormGroup>
-          </Col>
-          <Col xs={12} sm={6}>
-            <FormGroup controlId="community">
-              <Label required>Community</Label>
-              <FormControl
-                type="text"
-                value={props.getValue('community')}
-                placeholder="General"
-                onChange={e => props.setValue('community', e.target.value)}
-              />
-              {props.isSubmitted() && props.errors && props.errors.community && (
-                <ErrorLabel> {props.errors.community} </ErrorLabel>
-              )}
-            </FormGroup>
-          </Col>
-        </Row>
-        <Row>
-          <Col xs={12} sm={6}>
-            <FormGroup controlId="bloodGroup">
-              <Label required>bloodGroup</Label>
-              <FormControl
-                type="text"
-                value={props.getValue('bloodGroup')}
-                placeholder="B+"
-                onChange={e => props.setValue('bloodGroup', e.target.value)}
-              />
-              {props.isSubmitted() && props.errors && props.errors.bloodGroup && (
-                <ErrorLabel> {props.errors.bloodGroup} </ErrorLabel>
-              )}
-            </FormGroup>
-          </Col>
-          <Col xs={12} sm={6}>
-            <FormGroup controlId="phone">
-              <Label required>Phone</Label>
-              <FormControl
-                type="text"
-                value={props.getValue('phone')}
-                placeholder="9999999999"
-                onChange={e => props.setValue('phone', e.target.value)}
-              />
-              {props.isSubmitted() && props.errors && props.errors.phone && (
-                <ErrorLabel> {props.errors.phone} </ErrorLabel>
-              )}
-            </FormGroup>
-          </Col>
-        </Row>
-      </fieldset>
-    )}
-    {props.currentStep === 2 && (
-      <fieldset title="Address">
-        <legend className="text-semibold">Address</legend>
-        <Row>
-          <Col xs={12} sm={6}>
-            <FormGroup controlId="address">
-              <Label required>Address</Label>
-              <FormControl
-                type="text"
-                value={props.getValue('address')}
-                placeholder="#876, Street, town"
-                onChange={e => props.setValue('address', e.target.value)}
-              />
-              {props.isSubmitted() && props.errors && props.errors.address && (
-                <ErrorLabel> {props.errors.address} </ErrorLabel>
-              )}
-            </FormGroup>
-          </Col>
-          <Col xs={12} sm={6}>
-            <FormGroup controlId="city">
-              <Label required>City</Label>
-              <FormControl
-                type="text"
-                value={props.getValue('city')}
-                placeholder="Chennai"
-                onChange={e => props.setValue('city', e.target.value)}
-              />
-              {props.isSubmitted() && props.errors && props.errors.city && (
-                <ErrorLabel> {props.errors.city} </ErrorLabel>
-              )}
-            </FormGroup>
-          </Col>
-        </Row>
-        <Row>
-          <Col xs={12} sm={6}>
-            <FormGroup controlId="state">
-              <Label required>State</Label>
-              <FormControl
-                type="text"
-                value={props.getValue('state')}
-                placeholder="Tamilnadu"
-                onChange={e => props.setValue('state', e.target.value)}
-              />
-              {props.isSubmitted() && props.errors && props.errors.state && (
-                <ErrorLabel> {props.errors.state} </ErrorLabel>
-              )}
-            </FormGroup>
-          </Col>
-        </Row>
-      </fieldset>
-    )}
-    {props.currentStep === 3 && (
-      <fieldset title="2">
-        <legend className="text-semibold">Parent information</legend>
-        <Row>
-          <Col xs={12} sm={6}>
-            <FormGroup controlId="parentName">
-              <Label required>Parent Name</Label>
-              <FormControl
-                type="text"
-                value={props.getValue('parentName')}
-                placeholder="John"
-                onChange={e => props.setValue('parentName', e.target.value)}
-              />
-              {props.isSubmitted() && props.errors && props.errors.parentName && (
-                <ErrorLabel> {props.errors.parentName} </ErrorLabel>
-              )}
-            </FormGroup>
-          </Col>
-          <Col xs={12} sm={6}>
-            <FormGroup controlId="parentEmail">
-              <Label required>Parent Email</Label>
-              <FormControl
-                type="text"
-                value={props.getValue('parentEmail')}
-                placeholder="john@email.com"
-                onChange={e => props.setValue('parentEmail', e.target.value)}
-              />
-              {props.isSubmitted() && props.errors && props.errors.parentEmail && (
-                <ErrorLabel> {props.errors.parentEmail} </ErrorLabel>
-              )}
-            </FormGroup>
-          </Col>
-        </Row>
-        <Row>
-          <Col xs={12} sm={6}>
-            <FormGroup controlId="relation">
-              <Label required>Relation</Label>
-              <FormControl
-                type="text"
-                value={props.getValue('relation')}
-                placeholder="Father"
-                onChange={e => props.setValue('relation', e.target.value)}
-              />
-              {props.isSubmitted() && props.errors && props.errors.relation && (
-                <ErrorLabel> {props.errors.relation} </ErrorLabel>
-              )}
-            </FormGroup>
-          </Col>
-          <Col xs={12} sm={6}>
-            <FormGroup controlId="profession">
-              <Label required>Profession</Label>
-              <FormControl
-                type="text"
-                value={props.getValue('profession')}
-                placeholder="Farmer"
-                onChange={e => props.setValue('profession', e.target.value)}
-              />
-              {props.isSubmitted() && props.errors && props.errors.profession && (
-                <ErrorLabel> {props.errors.profession} </ErrorLabel>
-              )}
-            </FormGroup>
-          </Col>
-        </Row>
-        <Row>
-          <Col xs={12} sm={6}>
-            <FormGroup controlId="parentGender">
-              <Label>Parent Gender</Label>
-              <FormControl componentClass="select"
-                placeholder="select"
-                value={props.getValue('parentGender')}
-                onChange={e => props.setValue('parentGender', e.target.value)}
-                >
-                <option value="male">Male</option>
-                <option value="female">Female</option>
-              </FormControl>
-              {props.isSubmitted() && props.errors && props.errors.parentGender && (
-                <ErrorLabel> {props.errors.parentGender} </ErrorLabel>
-              )}
-            </FormGroup>
-          </Col>
-          <Col xs={12} sm={6}>
-            <FormGroup controlId="parentPhone">
-              <Label required>Parent Phone</Label>
-              <FormControl
-                type="text"
-                value={props.getValue('parentPhone')}
-                placeholder="9876543210"
-                onChange={e => props.setValue('parentPhone', e.target.value)}
-              />
-              {props.isSubmitted() && props.errors && props.errors.parentPhone && (
-                <ErrorLabel> {props.errors.parentPhone} </ErrorLabel>
-              )}
-            </FormGroup>
-          </Col>
-        </Row>
-        <Row>
-          <Col xs={12} sm={6}>
-            <FormGroup controlId="parentAddress">
-              <Label required>Parent Address</Label>
-              <FormControl
-                type="text"
-                value={props.getValue('parentAddress')}
-                placeholder="#12, street, town"
-                onChange={e => props.setValue('parentAddress', e.target.value)}
-              />
-              {props.isSubmitted() && props.errors && props.errors.parentAddress && (
-                <ErrorLabel> {props.errors.parentAddress} </ErrorLabel>
-              )}
-            </FormGroup>
-          </Col>
-          <Col xs={12} sm={6}>
-            <FormGroup controlId="parentCity">
-              <Label required>Parent City</Label>
-              <FormControl
-                type="text"
-                value={props.getValue('parentCity')}
-                placeholder="Chennai"
-                onChange={e => props.setValue('parentCity', e.target.value)}
-              />
-              {props.isSubmitted() && props.errors && props.errors.parentCity && (
-                <ErrorLabel> {props.errors.parentCity} </ErrorLabel>
-              )}
-            </FormGroup>
-          </Col>
-        </Row>
-        <Row>
-        <Col xs={12} sm={6}>
-          <FormGroup controlId="parentState">
-            <Label required>Parent State</Label>
-            <FormControl
-              type="text"
-              value={props.getValue('parentState')}
-              placeholder="600031"
-              onChange={e => props.setValue('parentState', e.target.value)}
-            />
-            {props.isSubmitted() && props.errors && props.errors.parentState && (
-              <ErrorLabel> {props.errors.parentState} </ErrorLabel>
-            )}
-          </FormGroup>
-        </Col>
-          <Col xs={12} sm={6}>
-            <FormGroup controlId="parentZipcode">
-              <Label required>Parent Zipcode</Label>
-              <FormControl
-                type="text"
-                value={props.getValue('parentZipcode')}
-                placeholder="600031"
-                onChange={e => props.setValue('parentZipcode', e.target.value)}
-              />
-              {props.isSubmitted() && props.errors && props.errors.parentZipcode && (
-                <ErrorLabel> {props.errors.parentZipcode} </ErrorLabel>
-              )}
-            </FormGroup>
-          </Col>
-        </Row>
-      </fieldset>
-    )}
-    <div style={{ textAlign: 'left' }}>
-      {props.currentStep > 0 && (
-        <div style={{ display: 'inline-block', marginRight: 10 }}>
-          <Button onClick={props.onBackClick}>
-            <i className="icon-arrow-left13 position-left"></i>
-            BACK
-          </Button>
-
-        </div>
-      )}
-      {props.currentStep < 3 && (
-        <div style={{ display: 'inline-block' }}>
-          <Button
-            bsStyle="primary"
-            onClick={props.onNextClick}
-          >
-            NEXT
-            <i className="icon-arrow-right14 position-right" />
-          </Button>
-        </div>
-      )}
-      {props.currentStep === 3 && (
-        <div style={{ display: 'inline-block' }}>
-          <Button
-            bsStyle="primary"
-            onClick={props.onNextClick}
-          >
-            SAVE
-            <i className="fa fa-check" />
-          </Button>
-        </div>
-      )}
-    </div>
-  </div>
-)
-
-StudentForm.propTypes = {
-  currentStep: PropTypes.number.isRequired,
-  onNextClick: PropTypes.func.isRequired,
-  onBackClick: PropTypes.func.isRequired,
-  setValue: PropTypes.func.isRequired,
-  getValue: PropTypes.func.isRequired,
-}
-
-export default StudentForm
diff --git a/imports/client/views/org/admin/students/StudentView.js b/imports/client/views/org/admin/students/StudentView.js
index 0eb6e05..1de12fe 100644
--- a/imports/client/views/org/admin/students/StudentView.js
+++ b/imports/client/views/org/admin/students/StudentView.js
@@ -12,11 +12,10 @@ import { StudentTable }                   from './view/StudentTable';
 import { Header }                         from '../Header';
 import { AdminSidebar }                   from '../Sidebar'
 import { AdminBreadcrumb }                from '../Breadcrumb'
-import { FabMenuView }                    from './FabMenu';
 import { UploadCsv }                      from './UploadCsv';
-import { AddStudent }                     from './addStudent';
+import { AddStudent }                     from './add/addStudent';
 import { Students }                       from '/imports/collections/students/index';
-
+import './student.css'
 
 export class StudentView extends Component {
 
diff --git a/imports/client/views/org/admin/students/add/AddStudentFormContainer.js b/imports/client/views/org/admin/students/add/AddStudentFormContainer.js
new file mode 100644
index 0000000..85ef828
--- /dev/null
+++ b/imports/client/views/org/admin/students/add/AddStudentFormContainer.js
@@ -0,0 +1,96 @@
+import React, { Component }               from 'react'
+import { AddStudentForm }                 from './addStudentForm'
+import StudentForm                        from './StudentForm'
+import Form                               from '/imports/client/views/core/Form'
+import Validator                          from '/imports/client/views/core/Validator'
+import { isRequired, isValidEmail }       from '/imports/client/views/core/validations'
+import { addStudentManually }             from '/imports/collections/students/methods';
+
+export class AddStudentFormContainer extends Component {
+
+  constructor(props) {
+    super(props)
+    this.state = { currentStep: 0 }
+    this.handleNextClick = this.handleNextClick.bind(this)
+    this.handleBackClick = this.handleBackClick.bind(this)
+    this.handleSubmit = this.handleSubmit.bind(this)
+  }
+
+  handleNextClick() {
+    this.form.handleSubmit()
+    if (this.validator.getErrors() && Object.keys(this.validator.getErrors()).length > 0) return
+    this.setState({ currentStep: this.state.currentStep + 1 })
+    this.form.resetSubmitted()
+  }
+
+  handleBackClick() {
+    this.setState({ currentStep: this.state.currentStep + -1 })
+  }
+
+  handleSubmit() {
+    if (this.state.currentStep === 3) {
+      addStudentManually.call(this.form.state.values)
+    }
+  }
+
+  //render callback
+  render() {
+    return (
+      <Form
+        onSubmit={this.handleSubmit}
+        ref={form => this.form = form}
+        initialValues={{
+          gender: 'male',
+          parentGender: 'male',
+        }}
+      >
+        {({ values, setValue, getValue, isSubmitted, isDirty }) => (
+          <Validator
+            values={values}
+            ref={validator => this.validator = validator}
+            validations={{
+              admissionId: [(value) => isRequired('Admission id', value)],
+              firstName: [(value) => isRequired('First name', value)],
+              lastName: [(value) => isRequired('Last name', value)],
+              email: [(value) => isRequired('Email', value), isValidEmail],
+              dob: [(value) => isRequired('Date of birth', value)],
+              gender: [(value) => isRequired('Gender', value)],
+              rollNo: [(value) => this.state.currentStep === 1 && isRequired('Roll no', value)],
+              studentClass: [(value) => this.state.currentStep === 1 && isRequired('Class', value)],
+              section: [(value) => this.state.currentStep === 1 && isRequired('Section', value)],
+              community: [(value) => this.state.currentStep === 1 && isRequired('Community', value)],
+              bloodGroup: [(value) => this.state.currentStep === 1 && isRequired('Blood group', value)],
+              phone: [(value) => this.state.currentStep === 1 && isRequired('Phone', value)],
+              address: [(value) => this.state.currentStep === 2 && isRequired('Address', value)],
+              city: [(value) => this.state.currentStep === 2 && isRequired('City', value)],
+              state: [(value) => this.state.currentStep === 2 && isRequired('State', value)],
+              parentName: [(value) => this.state.currentStep === 3 && isRequired('Parent name', value)],
+              parentEmail: [(value) => this.state.currentStep === 3 && isRequired('Parent email', value), (value) => this.state.currentStep === 3 && isValidEmail(value)],
+              relation: [(value) => this.state.currentStep === 3 && isRequired('Relation', value)],
+              profession: [(value) => this.state.currentStep === 3 && isRequired('Profession', value)],
+              parentGender: [(value) => this.state.currentStep === 3 && isRequired('Parent gender', value)],
+              parentPhone: [(value) => this.state.currentStep === 3 && isRequired('Parent phone', value)],
+              parentAddress: [(value) => this.state.currentStep === 3 && isRequired('Parent address', value)],
+              parentCity: [(value) => this.state.currentStep === 3 && isRequired('Parent city', value)],
+              parentState: [(value) => this.state.currentStep === 3 && isRequired('Parent state', value)],
+              parentZipcode: [(value) => this.state.currentStep === 3 && isRequired('Parent zip code', value)],
+            }}
+          >
+            {({ errors }) => (
+              <StudentForm
+                isDirty={isDirty}
+                setValue={setValue}
+                getValue={getValue}
+                isSubmitted={isSubmitted}
+                errors={errors}
+                onNextClick={this.handleNextClick}
+                onBackClick={this.handleBackClick}
+                currentStep={this.state.currentStep}
+              />
+            )}
+          </Validator>
+        )}
+      </Form>
+    )
+  }
+}
diff --git a/imports/client/views/org/admin/students/add/StudentForm.js b/imports/client/views/org/admin/students/add/StudentForm.js
new file mode 100644
index 0000000..2db920a
--- /dev/null
+++ b/imports/client/views/org/admin/students/add/StudentForm.js
@@ -0,0 +1,485 @@
+import React, { PropTypes } from 'react'
+import {
+  Row,
+  Col,
+  FormGroup,
+  FormControl,
+  Button
+} from 'react-bootstrap'
+import DatePicker from '/imports/client/views/core/DatePicker'
+import Label from '/imports/client/views/core/Label'
+import Stepper from '/imports/client/views/core/Stepper'
+import ErrorLabel from '/imports/client/views/core/ErrorLabel'
+
+const StudentForm = props => (
+  <div className="stepy-validation">
+    <Stepper
+      steps={[
+        {
+          label: 'Personal data',
+          active: props.currentStep === 0,
+        },
+        {
+          label: 'Academic',
+          active: props.currentStep === 1,
+        },
+        {
+          label: 'Address',
+          active: props.currentStep === 2,
+        },
+        {
+          label: 'Parent info',
+          active: props.currentStep === 3,
+        }
+      ]}
+    />
+    {props.currentStep === 0 && (
+      <fieldset title="1">
+        <legend className="text-semibold">Personal data</legend>
+        <Row>
+          <Col xs={12} sm={6}>
+            <FormGroup controlId="admissionId">
+              <Label required>Admission Id</Label>
+              <FormControl
+                type="text"
+                value={props.getValue('admissionId')}
+                placeholder="admission Id"
+                onChange={e => props.setValue('admissionId', e.target.value)}
+              />
+              {props.isSubmitted() && props.errors && props.errors.admissionId && (
+                <ErrorLabel> {props.errors.admissionId} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+          <Col xs={12} sm={6}>
+            <FormGroup controlId="firstName">
+              <Label required>First Name</Label>
+              <FormControl
+                type="text"
+                value={props.getValue('firstName')}
+                placeholder="First Name"
+                onChange={e => props.setValue('firstName', e.target.value)}
+              />
+              {props.isSubmitted() && props.errors && props.errors.firstName && (
+                <ErrorLabel> {props.errors.firstName} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+        </Row>
+        <Row>
+        <Col xs={12} sm={6}>
+          <FormGroup controlId="lastName">
+            <Label required>Last Name</Label>
+            <FormControl
+              type="text"
+              value={props.getValue('lastName')}
+              placeholder="Last Name"
+              onChange={e => props.setValue('lastName', e.target.value)}
+            />
+            {props.isSubmitted() && props.errors && props.errors.lastName && (
+              <ErrorLabel> {props.errors.lastName} </ErrorLabel>
+            )}
+          </FormGroup>
+        </Col>
+        <Col xs={12} sm={6}>
+          <FormGroup controlId="formControlsSelect">
+            <Label>Gender</Label>
+            <FormControl componentClass="select"
+              placeholder="select"
+              value={props.getValue('gender')}
+              onChange={e => props.setValue('gender', e.target.value)}
+              >
+              <option value="male">Male</option>
+              <option value="female">Female</option>
+            </FormControl>
+            {props.isSubmitted() && props.errors && props.errors.gender && (
+              <ErrorLabel> {props.errors.gender} </ErrorLabel>
+            )}
+          </FormGroup>
+        </Col>
+        </Row>
+        <Row>
+          <Col xs={12} sm={6}>
+            <FormGroup controlId="email">
+              <Label required>Email</Label>
+              <FormControl
+                type="email"
+                value={props.getValue('email')}
+                placeholder="Email"
+                onChange={e => props.setValue('email', e.target.value)}
+              />
+              {props.isSubmitted() && props.errors && props.errors.email && (
+                <ErrorLabel> {props.errors.email} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+          <Col xs={12} sm={6}>
+            <FormGroup>
+              <Label required>Date of birth</Label>
+              <DatePicker
+                id="dob"
+                setValue = {props.setValue}
+                value={props.getValue('dob')}
+                onChange={(e) => {
+                  props.setValue('dob', e.target.value)
+                }}
+              />
+              {props.isSubmitted() && props.errors && props.errors.dob && (
+                <ErrorLabel> {props.errors.dob} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+        </Row>
+        <Row>
+
+        </Row>
+      </fieldset>
+    )}
+    {props.currentStep === 1 && (
+      <fieldset title="Academic">
+        <legend className="text-semibold">Academic</legend>
+        <Row>
+          <Col xs={12} sm={6}>
+            <FormGroup controlId="rollNo">
+              <Label required>Roll No</Label>
+              <FormControl
+                type="text"
+                value={props.getValue('rollNo')}
+                placeholder="Roll No"
+                onChange={e => props.setValue('rollNo', e.target.value)}
+              />
+              {props.isSubmitted() && props.errors && props.errors.rollNo && (
+                <ErrorLabel> {props.errors.rollNo} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+          <Col xs={12} sm={6}>
+            <FormGroup controlId="class">
+              <Label required>Class</Label>
+              <FormControl
+                type="text"
+                value={props.getValue('studentClass')}
+                placeholder="7"
+                onChange={e => props.setValue('studentClass', e.target.value)}
+              />
+              {props.isSubmitted() && props.errors && props.errors.studentClass && (
+                <ErrorLabel> {props.errors.studentClass} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+        </Row>
+        <Row>
+          <Col xs={12} sm={6}>
+            <FormGroup controlId="section">
+              <Label required>Section</Label>
+              <FormControl
+                type="text"
+                value={props.getValue('section')}
+                placeholder="B"
+                onChange={e => props.setValue('section', e.target.value)}
+              />
+              {props.isSubmitted() && props.errors && props.errors.section && (
+                <ErrorLabel> {props.errors.section} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+          <Col xs={12} sm={6}>
+            <FormGroup controlId="community">
+              <Label required>Community</Label>
+              <FormControl
+                type="text"
+                value={props.getValue('community')}
+                placeholder="General"
+                onChange={e => props.setValue('community', e.target.value)}
+              />
+              {props.isSubmitted() && props.errors && props.errors.community && (
+                <ErrorLabel> {props.errors.community} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+        </Row>
+        <Row>
+          <Col xs={12} sm={6}>
+            <FormGroup controlId="bloodGroup">
+              <Label required>bloodGroup</Label>
+              <FormControl
+                type="text"
+                value={props.getValue('bloodGroup')}
+                placeholder="B+"
+                onChange={e => props.setValue('bloodGroup', e.target.value)}
+              />
+              {props.isSubmitted() && props.errors && props.errors.bloodGroup && (
+                <ErrorLabel> {props.errors.bloodGroup} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+          <Col xs={12} sm={6}>
+            <FormGroup controlId="phone">
+              <Label required>Phone</Label>
+              <FormControl
+                type="text"
+                value={props.getValue('phone')}
+                placeholder="9999999999"
+                onChange={e => props.setValue('phone', e.target.value)}
+              />
+              {props.isSubmitted() && props.errors && props.errors.phone && (
+                <ErrorLabel> {props.errors.phone} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+        </Row>
+      </fieldset>
+    )}
+    {props.currentStep === 2 && (
+      <fieldset title="Address">
+        <legend className="text-semibold">Address</legend>
+        <Row>
+          <Col xs={12} sm={6}>
+            <FormGroup controlId="address">
+              <Label required>Address</Label>
+              <FormControl
+                type="text"
+                value={props.getValue('address')}
+                placeholder="#876, Street, town"
+                onChange={e => props.setValue('address', e.target.value)}
+              />
+              {props.isSubmitted() && props.errors && props.errors.address && (
+                <ErrorLabel> {props.errors.address} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+          <Col xs={12} sm={6}>
+            <FormGroup controlId="city">
+              <Label required>City</Label>
+              <FormControl
+                type="text"
+                value={props.getValue('city')}
+                placeholder="Chennai"
+                onChange={e => props.setValue('city', e.target.value)}
+              />
+              {props.isSubmitted() && props.errors && props.errors.city && (
+                <ErrorLabel> {props.errors.city} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+        </Row>
+        <Row>
+          <Col xs={12} sm={6}>
+            <FormGroup controlId="state">
+              <Label required>State</Label>
+              <FormControl
+                type="text"
+                value={props.getValue('state')}
+                placeholder="Tamilnadu"
+                onChange={e => props.setValue('state', e.target.value)}
+              />
+              {props.isSubmitted() && props.errors && props.errors.state && (
+                <ErrorLabel> {props.errors.state} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+        </Row>
+      </fieldset>
+    )}
+    {props.currentStep === 3 && (
+      <fieldset title="2">
+        <legend className="text-semibold">Parent information</legend>
+        <Row>
+          <Col xs={12} sm={6}>
+            <FormGroup controlId="parentName">
+              <Label required>Parent Name</Label>
+              <FormControl
+                type="text"
+                value={props.getValue('parentName')}
+                placeholder="John"
+                onChange={e => props.setValue('parentName', e.target.value)}
+              />
+              {props.isSubmitted() && props.errors && props.errors.parentName && (
+                <ErrorLabel> {props.errors.parentName} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+          <Col xs={12} sm={6}>
+            <FormGroup controlId="parentEmail">
+              <Label required>Parent Email</Label>
+              <FormControl
+                type="text"
+                value={props.getValue('parentEmail')}
+                placeholder="john@email.com"
+                onChange={e => props.setValue('parentEmail', e.target.value)}
+              />
+              {props.isSubmitted() && props.errors && props.errors.parentEmail && (
+                <ErrorLabel> {props.errors.parentEmail} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+        </Row>
+        <Row>
+          <Col xs={12} sm={6}>
+            <FormGroup controlId="relation">
+              <Label required>Relation</Label>
+              <FormControl
+                type="text"
+                value={props.getValue('relation')}
+                placeholder="Father"
+                onChange={e => props.setValue('relation', e.target.value)}
+              />
+              {props.isSubmitted() && props.errors && props.errors.relation && (
+                <ErrorLabel> {props.errors.relation} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+          <Col xs={12} sm={6}>
+            <FormGroup controlId="profession">
+              <Label required>Profession</Label>
+              <FormControl
+                type="text"
+                value={props.getValue('profession')}
+                placeholder="Farmer"
+                onChange={e => props.setValue('profession', e.target.value)}
+              />
+              {props.isSubmitted() && props.errors && props.errors.profession && (
+                <ErrorLabel> {props.errors.profession} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+        </Row>
+        <Row>
+          <Col xs={12} sm={6}>
+            <FormGroup controlId="parentGender">
+              <Label>Parent Gender</Label>
+              <FormControl componentClass="select"
+                placeholder="select"
+                value={props.getValue('parentGender')}
+                onChange={e => props.setValue('parentGender', e.target.value)}
+                >
+                <option value="male">Male</option>
+                <option value="female">Female</option>
+              </FormControl>
+              {props.isSubmitted() && props.errors && props.errors.parentGender && (
+                <ErrorLabel> {props.errors.parentGender} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+          <Col xs={12} sm={6}>
+            <FormGroup controlId="parentPhone">
+              <Label required>Parent Phone</Label>
+              <FormControl
+                type="text"
+                value={props.getValue('parentPhone')}
+                placeholder="9876543210"
+                onChange={e => props.setValue('parentPhone', e.target.value)}
+              />
+              {props.isSubmitted() && props.errors && props.errors.parentPhone && (
+                <ErrorLabel> {props.errors.parentPhone} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+        </Row>
+        <Row>
+          <Col xs={12} sm={6}>
+            <FormGroup controlId="parentAddress">
+              <Label required>Parent Address</Label>
+              <FormControl
+                type="text"
+                value={props.getValue('parentAddress')}
+                placeholder="#12, street, town"
+                onChange={e => props.setValue('parentAddress', e.target.value)}
+              />
+              {props.isSubmitted() && props.errors && props.errors.parentAddress && (
+                <ErrorLabel> {props.errors.parentAddress} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+          <Col xs={12} sm={6}>
+            <FormGroup controlId="parentCity">
+              <Label required>Parent City</Label>
+              <FormControl
+                type="text"
+                value={props.getValue('parentCity')}
+                placeholder="Chennai"
+                onChange={e => props.setValue('parentCity', e.target.value)}
+              />
+              {props.isSubmitted() && props.errors && props.errors.parentCity && (
+                <ErrorLabel> {props.errors.parentCity} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+        </Row>
+        <Row>
+        <Col xs={12} sm={6}>
+          <FormGroup controlId="parentState">
+            <Label required>Parent State</Label>
+            <FormControl
+              type="text"
+              value={props.getValue('parentState')}
+              placeholder="600031"
+              onChange={e => props.setValue('parentState', e.target.value)}
+            />
+            {props.isSubmitted() && props.errors && props.errors.parentState && (
+              <ErrorLabel> {props.errors.parentState} </ErrorLabel>
+            )}
+          </FormGroup>
+        </Col>
+          <Col xs={12} sm={6}>
+            <FormGroup controlId="parentZipcode">
+              <Label required>Parent Zipcode</Label>
+              <FormControl
+                type="text"
+                value={props.getValue('parentZipcode')}
+                placeholder="600031"
+                onChange={e => props.setValue('parentZipcode', e.target.value)}
+              />
+              {props.isSubmitted() && props.errors && props.errors.parentZipcode && (
+                <ErrorLabel> {props.errors.parentZipcode} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+        </Row>
+      </fieldset>
+    )}
+    <div style={{ textAlign: 'left' }}>
+      {props.currentStep > 0 && (
+        <div style={{ display: 'inline-block', marginRight: 10 }}>
+          <Button onClick={props.onBackClick}>
+            <i className="icon-arrow-left13 position-left"></i>
+            BACK
+          </Button>
+
+        </div>
+      )}
+      {props.currentStep < 3 && (
+        <div style={{ display: 'inline-block' }}>
+          <Button
+            bsStyle="primary"
+            onClick={props.onNextClick}
+          >
+            NEXT
+            <i className="icon-arrow-right14 position-right" />
+          </Button>
+        </div>
+      )}
+      {props.currentStep === 3 && (
+        <div style={{ display: 'inline-block' }}>
+          <Button
+            bsStyle="primary"
+            onClick={props.onNextClick}
+          >
+            SAVE
+            <i className="fa fa-check" />
+          </Button>
+        </div>
+      )}
+    </div>
+  </div>
+)
+
+StudentForm.propTypes = {
+  currentStep: PropTypes.number.isRequired,
+  onNextClick: PropTypes.func.isRequired,
+  onBackClick: PropTypes.func.isRequired,
+  setValue: PropTypes.func.isRequired,
+  getValue: PropTypes.func.isRequired,
+}
+
+export default StudentForm
diff --git a/imports/client/views/org/admin/students/add/addStudent.js b/imports/client/views/org/admin/students/add/addStudent.js
new file mode 100644
index 0000000..14c9129
--- /dev/null
+++ b/imports/client/views/org/admin/students/add/addStudent.js
@@ -0,0 +1,63 @@
+import _                                  from 'lodash';
+import { Meteor }                         from 'meteor/meteor';
+import React, { Component }               from 'react';
+import { Link,browserHistory }            from 'react-router';
+import { FormGroup,Panel,Table,
+  ButtonToolbar,Modal,
+  FormControl,Glyphicon,Button }          from 'react-bootstrap';
+import { AddStudentFormContainer }        from './AddStudentFormContainer';
+
+const style = {
+  margin: 12,
+};
+export class AddStudent extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      show: false
+    };
+    this.showModal = this.showModal.bind(this);
+    this.hideModal = this.hideModal.bind(this);
+    this.onUpdate = this.onUpdate.bind(this);
+  };
+
+    showModal() {
+      this.setState({show: true});
+    }
+
+    hideModal() {
+      this.setState({show: false});
+    }
+  onUpdate(key, value) {
+    this.setState({[key]: value});
+  };
+
+  render() {
+    return (
+      <ButtonToolbar>
+        <Button bsStyle="primary" onClick={this.showModal}>
+          Add Student
+        </Button>
+        <Modal
+          {...this.props}
+          show={this.state.show}
+          onHide={this.hideModal}
+          dialogClassName="custom-modal"
+        >
+          <Modal.Header closeButton>
+            <Modal.Title id="contained-modal-title-lg">New Student</Modal.Title>
+          </Modal.Header>
+          <Modal.Body>
+            <AddStudentFormContainer />
+          </Modal.Body>
+  {/*
+          <Modal.Footer>
+            <Button onClick={this.hideModal}>Close</Button>
+          </Modal.Footer>
+          */}
+        </Modal>
+      </ButtonToolbar>
+    );
+  };
+
+};
diff --git a/imports/client/views/org/admin/students/add/addStudentForm.js b/imports/client/views/org/admin/students/add/addStudentForm.js
new file mode 100644
index 0000000..9f41e25
--- /dev/null
+++ b/imports/client/views/org/admin/students/add/addStudentForm.js
@@ -0,0 +1,500 @@
+import _                                  from 'lodash';
+import { Meteor }                         from 'meteor/meteor';
+
+import React, { Component }               from 'react';
+import { Link,browserHistory }            from 'react-router';
+import { Form, FormGroup,InputGroup,
+  DropdownButton,MenuItem,ControlLabel,
+  SplitButton,
+  FormControl,Glyphicon,Button }          from 'react-bootstrap';
+import DatePicker                         from 'react-bootstrap-date-picker'
+import {addStudentManually}               from '/imports/collections/students/methods';
+
+export class AddStudentForm extends Component {
+
+  constructor(props) {
+    super(props);
+    this.state = {
+      admissionId:    "123",
+      firstName:      "first",
+      lastName:       "last",
+      middleName:     "middle",
+      email:          "deepak125.dk+21@gmail.com",
+      dob:            "",
+      formattedDob:   "",
+      gender:         "male",
+      rollNo:         "1",
+      class:          "2",
+      section:        "B",
+      community:      "SC",
+      bloodGroup:     "B+",
+      phone:          "9876543321",
+      address:        "address",
+      city:           "chennai",
+      state:          "tn",
+      parentName:     "parentName",
+      parentEmail:    "deepak125.dk+41@gmail.com",
+      relation:       "father",
+      profession:     "farmer",
+      parentGender:   "male",
+      parentPhone:    "987655412",
+      parentAddress:  "parentAddress",
+      parentCity:     "parentCity",
+      parentState:    "parentState",
+      parentZipcode:  "parentZipcode",
+    };
+    this.onUpdate = this.onUpdate.bind(this);
+    this.handleDob = this.handleDob.bind(this);
+  };
+
+  onUpdate(key, value) {
+    this.setState({[key]: value});
+  };
+
+  handleDob(value, formattedValue) {
+  this.setState({
+    dob: value, // ISO String, ex: "2016-11-19T12:00:00.000Z"
+    formattedDob: formattedValue // Formatted String, ex: "11/19/2016"
+  });
+}
+  addStudent(e){
+    e.preventDefault();
+    e.persist();
+    const firstName   = this.state.firstName;
+    const middleName  = this.state.middleName;
+    const lastName = this.state.lastName;
+    const admissionId = this.state.admissionId;
+    const email = this.state.email;
+    const dob = this.state.dob;
+    const formattedDob = this.state.formattedDob;
+    const gender = this.state.gender;
+    const rollNo = this.state.rollNo;
+    const studentclass = this.state.class;
+    const section = this.state.section;
+    const community = this.state.community;
+    const bloodGroup = this.state.bloodGroup;
+    const phone = this.state.phone;
+    const address = this.state.address;
+    const city = this.state.city;
+    const state = this.state.state;
+    const parentName = this.state.parentName;
+    const parentEmail = this.state.parentEmail;
+    const relation = this.state.relation;
+    const profession = this.state.profession;
+    const parentGender = this.state.parentGender;
+    const parentPhone = this.state.parentPhone;
+    const parentAddress = this.state.parentAddress;
+    const parentCity = this.state.parentCity;
+    const parentState = this.state.parentState;
+    const parentZipcode = this.state.parentZipcode;
+    if(admissionId==""){
+          Bert.alert('Enter Admission Id!', 'danger');
+    }else if(firstName==""){
+      Bert.alert('Enter Fist Name', 'danger');
+    } else if(middleName==""){
+          Bert.alert('Enter Middle name!', 'danger');
+    }else if(lastName==""){
+          Bert.alert('Enter Last name!', 'danger');
+    }else if(email==""){
+          Bert.alert('Enter email!', 'danger');
+    }else if(dob==""){
+          Bert.alert('Enter DOB!', 'danger');
+    }else if(gender==""){
+          Bert.alert('Enter Student Gender!', 'danger');
+    }else if(studentclass==""){
+          Bert.alert('Enter Class!', 'danger');
+    }else if(section==""){
+          Bert.alert('Enter Section!', 'danger');
+    }else if(community==""){
+          Bert.alert('Enter Section!', 'danger');
+    }else if(bloodGroup==""){
+          Bert.alert('Enter Blood Group!', 'danger');
+    }else if(phone==""){
+          Bert.alert('Enter phone!', 'danger');
+    }else if(address==""){
+          Bert.alert('Enter address!', 'danger');
+    }else if(city==""){
+          Bert.alert('Enter city!', 'danger');
+    }else if(state==""){
+          Bert.alert('Enter state!', 'danger');
+    }else if(parentName==""){
+          Bert.alert('Enter Parent name!', 'danger');
+    }else if(parentEmail==""){
+          Bert.alert('Enter Parent Email!', 'danger');
+    }else if(relation==""){
+          Bert.alert('Enter relation!', 'danger');
+    }else if(profession==""){
+          Bert.alert('Enter parent profession!', 'danger');
+    }else if(parentGender==""){
+          Bert.alert("Enter Parent's Gender!", 'danger');
+    }else if(parentPhone==""){
+          Bert.alert("Enter Parent's Phone!", 'danger');
+    }else if(parentAddress==""){
+          Bert.alert("Enter Parent's Address!", 'danger');
+    }else if(parentCity==""){
+          Bert.alert("Enter Parent's City!", 'danger');
+    }else if(parentState==""){
+          Bert.alert("Enter Parent's State!", 'danger');
+    }else if(parentZipcode==""){
+          Bert.alert("Enter Parent's zipcode!", 'danger');
+    }else{
+      addStudentManually.call({
+        admissionId,
+        firstName,
+        middleName,
+        lastName,
+        email,
+        dob,
+        formattedDob,
+        gender,
+        rollNo,
+        studentclass,
+        section,
+        community,
+        bloodGroup,
+        phone,
+        address,
+        city,
+        state,
+        parentName,
+        parentEmail,
+        relation,
+        profession,
+        parentGender,
+        parentPhone,
+        parentAddress,
+        parentCity,
+        parentState,
+        parentZipcode
+      }, function (error, result) {
+        console.log(error);
+          console.log(result);
+       });
+    }
+  }
+  render() {
+    return (
+      <Form className="steps-validation wizard clearfix" onSubmit={ (e) => this.addStudent(e) } inline>
+        <div className="steps clearfix">
+            <ul role="tablist">
+                <li role="tab" className="first current" aria-disabled="false" aria-selected="true">
+                    <a id="steps-uid-4-t-0" href="#steps-uid-4-h-0" aria-controls="steps-uid-4-p-0">
+                        <span className="current-info audible">current step: </span><span className="number">1</span> Personal data
+                    </a>
+                </li>
+                <li role="tab" className="disabled" aria-disabled="true">
+                    <a id="steps-uid-4-t-1" href="#steps-uid-4-h-1" aria-controls="steps-uid-4-p-1">
+                        <span className="number">2</span> Your education\n\
+                    </a>
+                </li>
+                <li role="tab" className="disabled" aria-disabled="true">
+                    <a id="steps-uid-4-t-2" href="#steps-uid-4-h-2" aria-controls="steps-uid-4-p-2">
+                        <span className="number">3</span> Your experience
+                    </a>
+                </li>
+                <li role="tab" className="disabled last" aria-disabled="true">
+                    <a id="steps-uid-4-t-3" href="#steps-uid-4-h-3" aria-controls="steps-uid-4-p-3">
+                        <span className="number">4</span> Additional info
+                    </a>
+                </li>
+            </ul>
+        </div>
+        <div className="content clearfix">
+            <h6 id="steps-uid-4-h-0" tabindex="-1" className="title current">Personal data</h6>
+            <div id="steps-uid-4-p-0" role="tabpanel" aria-labelledby="steps-uid-4-h-0" className="body current">
+                <div className="row">
+                    <div className="col-md-6">
+                        
+                            <FormGroup controlId="admissionId">
+                              <ControlLabel>Admission Id</ControlLabel>
+                              <FormControl
+                                type="text"
+                                value={this.state.admissionId}
+                                placeholder="admission Id"
+                                onChange={e=>this.onUpdate('admissionId',e.target.value)}
+                              />
+                            </FormGroup>
+
+                    </div>
+                    
+                    <div className="col-md-6">
+                    
+                            <FormGroup controlId="firstName">
+                              <ControlLabel>First Name</ControlLabel>
+                              <FormControl
+                                type="text"
+                                value={this.state.firstName}
+                                placeholder="First Name"
+                                onChange={e=>this.onUpdate('firstName',e.target.value)}
+                              />
+                            </FormGroup>
+                            
+                    </div>
+                </div>
+            </div>
+        </div>
+        
+      
+        <FormGroup controlId="admissionId">
+          <ControlLabel>Admission Id</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.admissionId}
+            placeholder="admission Id"
+            onChange={e=>this.onUpdate('admissionId',e.target.value)}
+          />
+        </FormGroup>
+
+        <FormGroup controlId="firstName">
+          <ControlLabel>First Name</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.firstName}
+            placeholder="First Name"
+            onChange={e=>this.onUpdate('firstName',e.target.value)}
+          />
+        </FormGroup>
+        <FormGroup controlId="middleName">
+          <ControlLabel>Middle Name</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.middleName}
+            placeholder="Middle Name"
+            onChange={e=>this.onUpdate('middleName',e.target.value)}
+          />
+        </FormGroup>
+
+        <FormGroup controlId="lastName">
+          <ControlLabel>Last Name</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.lastName}
+            placeholder="Last Name"
+            onChange={e=>this.onUpdate('lastName',e.target.value)}
+          />
+
+        </FormGroup>
+        <FormGroup controlId="email">
+          <ControlLabel>Email</ControlLabel>
+          <FormControl
+            type="email"
+            value={this.state.email}
+            placeholder="Email"
+            onChange={e=>this.onUpdate('email',e.target.value)}
+          />
+        </FormGroup>
+        <FormGroup>
+          <ControlLabel>Date of birth</ControlLabel>
+          <DatePicker id="dob"
+          value={this.state.dob}
+          onChange={this.handleDob}
+          />
+        </FormGroup>
+
+        <FormGroup controlId="formControlsSelect">
+          <ControlLabel>Gender</ControlLabel>
+          <FormControl componentClass="select"
+            placeholder="select"
+            value={this.state.gender}
+            onChange={e=>this.onUpdate('gender',e.target.value)}
+            >
+            <option value="male">Male</option>
+            <option value="female">Female</option>
+          </FormControl>
+        </FormGroup>
+
+        <FormGroup controlId="rollNo">
+          <ControlLabel>Roll No</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.rollNo}
+            placeholder="Roll No"
+            onChange={e=>this.onUpdate('rollNo',e.target.value)}
+          />
+        </FormGroup>
+        <FormGroup controlId="class">
+          <ControlLabel>Class</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.class}
+            placeholder="7"
+            onChange={e=>this.onUpdate('class',e.target.value)}
+          />
+        </FormGroup>
+        <FormGroup controlId="section">
+          <ControlLabel>Section</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.section}
+            placeholder="B"
+            onChange={e=>this.onUpdate('section',e.target.value)}
+          />
+        </FormGroup>
+
+        <FormGroup controlId="community">
+          <ControlLabel>Community</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.community}
+            placeholder="General"
+            onChange={e=>this.onUpdate('community',e.target.value)}
+          />
+        </FormGroup>
+
+        <FormGroup controlId="bloodGroup">
+          <ControlLabel>bloodGroup</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.bloodGroup}
+            placeholder="B+"
+            onChange={e=>this.onUpdate('bloodGroup',e.target.value)}
+          />
+        </FormGroup>
+
+        <FormGroup controlId="phone">
+          <ControlLabel>Phone</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.phone}
+            placeholder="9999999999"
+            onChange={e=>this.onUpdate('phone',e.target.value)}
+          />
+        </FormGroup>
+
+        <FormGroup controlId="address">
+          <ControlLabel>Address</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.address}
+            placeholder="#876, Street, town"
+            onChange={e=>this.onUpdate('address',e.target.value)}
+          />
+        </FormGroup>
+
+        <FormGroup controlId="city">
+          <ControlLabel>City</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.city}
+            placeholder="Chennai"
+            onChange={e=>this.onUpdate('city',e.target.value)}
+          />
+        </FormGroup>
+
+        <FormGroup controlId="state">
+          <ControlLabel>State</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.state}
+            placeholder="Tamilnadu"
+            onChange={e=>this.onUpdate('state',e.target.value)}
+          />
+        </FormGroup>
+
+        <FormGroup controlId="parentName">
+          <ControlLabel>Parent Name</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.parentName}
+            placeholder="John"
+            onChange={e=>this.onUpdate('parentName',e.target.value)}
+          />
+        </FormGroup>
+
+        <FormGroup controlId="parentEmail">
+          <ControlLabel>Parent Email</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.parentEmail}
+            placeholder="john@email.com"
+            onChange={e=>this.onUpdate('parentEmail',e.target.value)}
+          />
+        </FormGroup>
+
+        <FormGroup controlId="relation">
+          <ControlLabel>Relation</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.relation}
+            placeholder="Father"
+            onChange={e=>this.onUpdate('relation',e.target.value)}
+          />
+        </FormGroup>
+
+        <FormGroup controlId="profession">
+          <ControlLabel>Profession</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.profession}
+            placeholder="Farmer"
+            onChange={e=>this.onUpdate('profession',e.target.value)}
+          />
+        </FormGroup>
+
+        <FormGroup controlId="parentGender">
+          <ControlLabel>Parent Gender</ControlLabel>
+          <FormControl componentClass="select"
+            placeholder="select"
+            value={this.state.parentGender}
+            onChange={e=>this.onUpdate('parentGender',e.target.value)}
+            >
+            <option value="male">Male</option>
+            <option value="female">Female</option>
+          </FormControl>
+        </FormGroup>
+
+        <FormGroup controlId="parentPhone">
+          <ControlLabel>Parent Phone</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.parentPhone}
+            placeholder="9876543210"
+            onChange={e=>this.onUpdate('parentPhone',e.target.value)}
+          />
+        </FormGroup>
+
+        <FormGroup controlId="parentAddress">
+          <ControlLabel>Parent Address</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.parentAddress}
+            placeholder="#12, street, town"
+            onChange={e=>this.onUpdate('parentAddress',e.target.value)}
+          />
+        </FormGroup>
+
+        <FormGroup controlId="parentCity">
+          <ControlLabel>Parent City</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.parentCity}
+            placeholder="Chennai"
+            onChange={e=>this.onUpdate('parentCity',e.target.value)}
+          />
+        </FormGroup>
+
+        <FormGroup controlId="parentState">
+          <ControlLabel>Parent State</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.parentState}
+            placeholder="Tamilnadu"
+            onChange={e=>this.onUpdate('parentState',e.target.value)}
+          />
+        </FormGroup>
+
+        <FormGroup controlId="parentZipcode">
+          <ControlLabel>Parent Zipcode</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.parentZipcode}
+            placeholder="600031"
+            onChange={e=>this.onUpdate('parentZipcode',e.target.value)}
+          />
+        </FormGroup>
+        <Button type="submit" bsStyle="default">Add Student</Button>
+      </Form>
+    );
+  };
+
+};
diff --git a/imports/client/views/org/admin/students/addStudent.js b/imports/client/views/org/admin/students/addStudent.js
deleted file mode 100644
index c99fa52..0000000
--- a/imports/client/views/org/admin/students/addStudent.js
+++ /dev/null
@@ -1,64 +0,0 @@
-import _                                  from 'lodash';
-import { Meteor }                         from 'meteor/meteor';
-import './student.css'
-import React, { Component }               from 'react';
-import { Link,browserHistory }            from 'react-router';
-import { FormGroup,Panel,Table,
-  ButtonToolbar,Modal,
-  FormControl,Glyphicon,Button }          from 'react-bootstrap';
-import { AddStudentFormContainer }               from './AddStudentFormContainer';
-
-const style = {
-  margin: 12,
-};
-export class AddStudent extends Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      show: false
-    };
-    this.showModal = this.showModal.bind(this);
-    this.hideModal = this.hideModal.bind(this);
-    this.onUpdate = this.onUpdate.bind(this);
-  };
-
-    showModal() {
-      this.setState({show: true});
-    }
-
-    hideModal() {
-      this.setState({show: false});
-    }
-  onUpdate(key, value) {
-    this.setState({[key]: value});
-  };
-
-  render() {
-    return (
-      <ButtonToolbar>
-        <Button bsStyle="primary" onClick={this.showModal}>
-          Add Student
-        </Button>
-        <Modal
-          {...this.props}
-          show={this.state.show}
-          onHide={this.hideModal}
-          dialogClassName="custom-modal"
-        >
-          <Modal.Header closeButton>
-            <Modal.Title id="contained-modal-title-lg">New Student</Modal.Title>
-          </Modal.Header>
-          <Modal.Body>
-            <AddStudentFormContainer />
-          </Modal.Body>
-  {/*
-          <Modal.Footer>
-            <Button onClick={this.hideModal}>Close</Button>
-          </Modal.Footer>
-          */}
-        </Modal>
-      </ButtonToolbar>
-    );
-  };
-
-};
diff --git a/imports/client/views/org/admin/students/addStudentForm.js b/imports/client/views/org/admin/students/addStudentForm.js
deleted file mode 100644
index 9f41e25..0000000
--- a/imports/client/views/org/admin/students/addStudentForm.js
+++ /dev/null
@@ -1,500 +0,0 @@
-import _                                  from 'lodash';
-import { Meteor }                         from 'meteor/meteor';
-
-import React, { Component }               from 'react';
-import { Link,browserHistory }            from 'react-router';
-import { Form, FormGroup,InputGroup,
-  DropdownButton,MenuItem,ControlLabel,
-  SplitButton,
-  FormControl,Glyphicon,Button }          from 'react-bootstrap';
-import DatePicker                         from 'react-bootstrap-date-picker'
-import {addStudentManually}               from '/imports/collections/students/methods';
-
-export class AddStudentForm extends Component {
-
-  constructor(props) {
-    super(props);
-    this.state = {
-      admissionId:    "123",
-      firstName:      "first",
-      lastName:       "last",
-      middleName:     "middle",
-      email:          "deepak125.dk+21@gmail.com",
-      dob:            "",
-      formattedDob:   "",
-      gender:         "male",
-      rollNo:         "1",
-      class:          "2",
-      section:        "B",
-      community:      "SC",
-      bloodGroup:     "B+",
-      phone:          "9876543321",
-      address:        "address",
-      city:           "chennai",
-      state:          "tn",
-      parentName:     "parentName",
-      parentEmail:    "deepak125.dk+41@gmail.com",
-      relation:       "father",
-      profession:     "farmer",
-      parentGender:   "male",
-      parentPhone:    "987655412",
-      parentAddress:  "parentAddress",
-      parentCity:     "parentCity",
-      parentState:    "parentState",
-      parentZipcode:  "parentZipcode",
-    };
-    this.onUpdate = this.onUpdate.bind(this);
-    this.handleDob = this.handleDob.bind(this);
-  };
-
-  onUpdate(key, value) {
-    this.setState({[key]: value});
-  };
-
-  handleDob(value, formattedValue) {
-  this.setState({
-    dob: value, // ISO String, ex: "2016-11-19T12:00:00.000Z"
-    formattedDob: formattedValue // Formatted String, ex: "11/19/2016"
-  });
-}
-  addStudent(e){
-    e.preventDefault();
-    e.persist();
-    const firstName   = this.state.firstName;
-    const middleName  = this.state.middleName;
-    const lastName = this.state.lastName;
-    const admissionId = this.state.admissionId;
-    const email = this.state.email;
-    const dob = this.state.dob;
-    const formattedDob = this.state.formattedDob;
-    const gender = this.state.gender;
-    const rollNo = this.state.rollNo;
-    const studentclass = this.state.class;
-    const section = this.state.section;
-    const community = this.state.community;
-    const bloodGroup = this.state.bloodGroup;
-    const phone = this.state.phone;
-    const address = this.state.address;
-    const city = this.state.city;
-    const state = this.state.state;
-    const parentName = this.state.parentName;
-    const parentEmail = this.state.parentEmail;
-    const relation = this.state.relation;
-    const profession = this.state.profession;
-    const parentGender = this.state.parentGender;
-    const parentPhone = this.state.parentPhone;
-    const parentAddress = this.state.parentAddress;
-    const parentCity = this.state.parentCity;
-    const parentState = this.state.parentState;
-    const parentZipcode = this.state.parentZipcode;
-    if(admissionId==""){
-          Bert.alert('Enter Admission Id!', 'danger');
-    }else if(firstName==""){
-      Bert.alert('Enter Fist Name', 'danger');
-    } else if(middleName==""){
-          Bert.alert('Enter Middle name!', 'danger');
-    }else if(lastName==""){
-          Bert.alert('Enter Last name!', 'danger');
-    }else if(email==""){
-          Bert.alert('Enter email!', 'danger');
-    }else if(dob==""){
-          Bert.alert('Enter DOB!', 'danger');
-    }else if(gender==""){
-          Bert.alert('Enter Student Gender!', 'danger');
-    }else if(studentclass==""){
-          Bert.alert('Enter Class!', 'danger');
-    }else if(section==""){
-          Bert.alert('Enter Section!', 'danger');
-    }else if(community==""){
-          Bert.alert('Enter Section!', 'danger');
-    }else if(bloodGroup==""){
-          Bert.alert('Enter Blood Group!', 'danger');
-    }else if(phone==""){
-          Bert.alert('Enter phone!', 'danger');
-    }else if(address==""){
-          Bert.alert('Enter address!', 'danger');
-    }else if(city==""){
-          Bert.alert('Enter city!', 'danger');
-    }else if(state==""){
-          Bert.alert('Enter state!', 'danger');
-    }else if(parentName==""){
-          Bert.alert('Enter Parent name!', 'danger');
-    }else if(parentEmail==""){
-          Bert.alert('Enter Parent Email!', 'danger');
-    }else if(relation==""){
-          Bert.alert('Enter relation!', 'danger');
-    }else if(profession==""){
-          Bert.alert('Enter parent profession!', 'danger');
-    }else if(parentGender==""){
-          Bert.alert("Enter Parent's Gender!", 'danger');
-    }else if(parentPhone==""){
-          Bert.alert("Enter Parent's Phone!", 'danger');
-    }else if(parentAddress==""){
-          Bert.alert("Enter Parent's Address!", 'danger');
-    }else if(parentCity==""){
-          Bert.alert("Enter Parent's City!", 'danger');
-    }else if(parentState==""){
-          Bert.alert("Enter Parent's State!", 'danger');
-    }else if(parentZipcode==""){
-          Bert.alert("Enter Parent's zipcode!", 'danger');
-    }else{
-      addStudentManually.call({
-        admissionId,
-        firstName,
-        middleName,
-        lastName,
-        email,
-        dob,
-        formattedDob,
-        gender,
-        rollNo,
-        studentclass,
-        section,
-        community,
-        bloodGroup,
-        phone,
-        address,
-        city,
-        state,
-        parentName,
-        parentEmail,
-        relation,
-        profession,
-        parentGender,
-        parentPhone,
-        parentAddress,
-        parentCity,
-        parentState,
-        parentZipcode
-      }, function (error, result) {
-        console.log(error);
-          console.log(result);
-       });
-    }
-  }
-  render() {
-    return (
-      <Form className="steps-validation wizard clearfix" onSubmit={ (e) => this.addStudent(e) } inline>
-        <div className="steps clearfix">
-            <ul role="tablist">
-                <li role="tab" className="first current" aria-disabled="false" aria-selected="true">
-                    <a id="steps-uid-4-t-0" href="#steps-uid-4-h-0" aria-controls="steps-uid-4-p-0">
-                        <span className="current-info audible">current step: </span><span className="number">1</span> Personal data
-                    </a>
-                </li>
-                <li role="tab" className="disabled" aria-disabled="true">
-                    <a id="steps-uid-4-t-1" href="#steps-uid-4-h-1" aria-controls="steps-uid-4-p-1">
-                        <span className="number">2</span> Your education\n\
-                    </a>
-                </li>
-                <li role="tab" className="disabled" aria-disabled="true">
-                    <a id="steps-uid-4-t-2" href="#steps-uid-4-h-2" aria-controls="steps-uid-4-p-2">
-                        <span className="number">3</span> Your experience
-                    </a>
-                </li>
-                <li role="tab" className="disabled last" aria-disabled="true">
-                    <a id="steps-uid-4-t-3" href="#steps-uid-4-h-3" aria-controls="steps-uid-4-p-3">
-                        <span className="number">4</span> Additional info
-                    </a>
-                </li>
-            </ul>
-        </div>
-        <div className="content clearfix">
-            <h6 id="steps-uid-4-h-0" tabindex="-1" className="title current">Personal data</h6>
-            <div id="steps-uid-4-p-0" role="tabpanel" aria-labelledby="steps-uid-4-h-0" className="body current">
-                <div className="row">
-                    <div className="col-md-6">
-                        
-                            <FormGroup controlId="admissionId">
-                              <ControlLabel>Admission Id</ControlLabel>
-                              <FormControl
-                                type="text"
-                                value={this.state.admissionId}
-                                placeholder="admission Id"
-                                onChange={e=>this.onUpdate('admissionId',e.target.value)}
-                              />
-                            </FormGroup>
-
-                    </div>
-                    
-                    <div className="col-md-6">
-                    
-                            <FormGroup controlId="firstName">
-                              <ControlLabel>First Name</ControlLabel>
-                              <FormControl
-                                type="text"
-                                value={this.state.firstName}
-                                placeholder="First Name"
-                                onChange={e=>this.onUpdate('firstName',e.target.value)}
-                              />
-                            </FormGroup>
-                            
-                    </div>
-                </div>
-            </div>
-        </div>
-        
-      
-        <FormGroup controlId="admissionId">
-          <ControlLabel>Admission Id</ControlLabel>
-          <FormControl
-            type="text"
-            value={this.state.admissionId}
-            placeholder="admission Id"
-            onChange={e=>this.onUpdate('admissionId',e.target.value)}
-          />
-        </FormGroup>
-
-        <FormGroup controlId="firstName">
-          <ControlLabel>First Name</ControlLabel>
-          <FormControl
-            type="text"
-            value={this.state.firstName}
-            placeholder="First Name"
-            onChange={e=>this.onUpdate('firstName',e.target.value)}
-          />
-        </FormGroup>
-        <FormGroup controlId="middleName">
-          <ControlLabel>Middle Name</ControlLabel>
-          <FormControl
-            type="text"
-            value={this.state.middleName}
-            placeholder="Middle Name"
-            onChange={e=>this.onUpdate('middleName',e.target.value)}
-          />
-        </FormGroup>
-
-        <FormGroup controlId="lastName">
-          <ControlLabel>Last Name</ControlLabel>
-          <FormControl
-            type="text"
-            value={this.state.lastName}
-            placeholder="Last Name"
-            onChange={e=>this.onUpdate('lastName',e.target.value)}
-          />
-
-        </FormGroup>
-        <FormGroup controlId="email">
-          <ControlLabel>Email</ControlLabel>
-          <FormControl
-            type="email"
-            value={this.state.email}
-            placeholder="Email"
-            onChange={e=>this.onUpdate('email',e.target.value)}
-          />
-        </FormGroup>
-        <FormGroup>
-          <ControlLabel>Date of birth</ControlLabel>
-          <DatePicker id="dob"
-          value={this.state.dob}
-          onChange={this.handleDob}
-          />
-        </FormGroup>
-
-        <FormGroup controlId="formControlsSelect">
-          <ControlLabel>Gender</ControlLabel>
-          <FormControl componentClass="select"
-            placeholder="select"
-            value={this.state.gender}
-            onChange={e=>this.onUpdate('gender',e.target.value)}
-            >
-            <option value="male">Male</option>
-            <option value="female">Female</option>
-          </FormControl>
-        </FormGroup>
-
-        <FormGroup controlId="rollNo">
-          <ControlLabel>Roll No</ControlLabel>
-          <FormControl
-            type="text"
-            value={this.state.rollNo}
-            placeholder="Roll No"
-            onChange={e=>this.onUpdate('rollNo',e.target.value)}
-          />
-        </FormGroup>
-        <FormGroup controlId="class">
-          <ControlLabel>Class</ControlLabel>
-          <FormControl
-            type="text"
-            value={this.state.class}
-            placeholder="7"
-            onChange={e=>this.onUpdate('class',e.target.value)}
-          />
-        </FormGroup>
-        <FormGroup controlId="section">
-          <ControlLabel>Section</ControlLabel>
-          <FormControl
-            type="text"
-            value={this.state.section}
-            placeholder="B"
-            onChange={e=>this.onUpdate('section',e.target.value)}
-          />
-        </FormGroup>
-
-        <FormGroup controlId="community">
-          <ControlLabel>Community</ControlLabel>
-          <FormControl
-            type="text"
-            value={this.state.community}
-            placeholder="General"
-            onChange={e=>this.onUpdate('community',e.target.value)}
-          />
-        </FormGroup>
-
-        <FormGroup controlId="bloodGroup">
-          <ControlLabel>bloodGroup</ControlLabel>
-          <FormControl
-            type="text"
-            value={this.state.bloodGroup}
-            placeholder="B+"
-            onChange={e=>this.onUpdate('bloodGroup',e.target.value)}
-          />
-        </FormGroup>
-
-        <FormGroup controlId="phone">
-          <ControlLabel>Phone</ControlLabel>
-          <FormControl
-            type="text"
-            value={this.state.phone}
-            placeholder="9999999999"
-            onChange={e=>this.onUpdate('phone',e.target.value)}
-          />
-        </FormGroup>
-
-        <FormGroup controlId="address">
-          <ControlLabel>Address</ControlLabel>
-          <FormControl
-            type="text"
-            value={this.state.address}
-            placeholder="#876, Street, town"
-            onChange={e=>this.onUpdate('address',e.target.value)}
-          />
-        </FormGroup>
-
-        <FormGroup controlId="city">
-          <ControlLabel>City</ControlLabel>
-          <FormControl
-            type="text"
-            value={this.state.city}
-            placeholder="Chennai"
-            onChange={e=>this.onUpdate('city',e.target.value)}
-          />
-        </FormGroup>
-
-        <FormGroup controlId="state">
-          <ControlLabel>State</ControlLabel>
-          <FormControl
-            type="text"
-            value={this.state.state}
-            placeholder="Tamilnadu"
-            onChange={e=>this.onUpdate('state',e.target.value)}
-          />
-        </FormGroup>
-
-        <FormGroup controlId="parentName">
-          <ControlLabel>Parent Name</ControlLabel>
-          <FormControl
-            type="text"
-            value={this.state.parentName}
-            placeholder="John"
-            onChange={e=>this.onUpdate('parentName',e.target.value)}
-          />
-        </FormGroup>
-
-        <FormGroup controlId="parentEmail">
-          <ControlLabel>Parent Email</ControlLabel>
-          <FormControl
-            type="text"
-            value={this.state.parentEmail}
-            placeholder="john@email.com"
-            onChange={e=>this.onUpdate('parentEmail',e.target.value)}
-          />
-        </FormGroup>
-
-        <FormGroup controlId="relation">
-          <ControlLabel>Relation</ControlLabel>
-          <FormControl
-            type="text"
-            value={this.state.relation}
-            placeholder="Father"
-            onChange={e=>this.onUpdate('relation',e.target.value)}
-          />
-        </FormGroup>
-
-        <FormGroup controlId="profession">
-          <ControlLabel>Profession</ControlLabel>
-          <FormControl
-            type="text"
-            value={this.state.profession}
-            placeholder="Farmer"
-            onChange={e=>this.onUpdate('profession',e.target.value)}
-          />
-        </FormGroup>
-
-        <FormGroup controlId="parentGender">
-          <ControlLabel>Parent Gender</ControlLabel>
-          <FormControl componentClass="select"
-            placeholder="select"
-            value={this.state.parentGender}
-            onChange={e=>this.onUpdate('parentGender',e.target.value)}
-            >
-            <option value="male">Male</option>
-            <option value="female">Female</option>
-          </FormControl>
-        </FormGroup>
-
-        <FormGroup controlId="parentPhone">
-          <ControlLabel>Parent Phone</ControlLabel>
-          <FormControl
-            type="text"
-            value={this.state.parentPhone}
-            placeholder="9876543210"
-            onChange={e=>this.onUpdate('parentPhone',e.target.value)}
-          />
-        </FormGroup>
-
-        <FormGroup controlId="parentAddress">
-          <ControlLabel>Parent Address</ControlLabel>
-          <FormControl
-            type="text"
-            value={this.state.parentAddress}
-            placeholder="#12, street, town"
-            onChange={e=>this.onUpdate('parentAddress',e.target.value)}
-          />
-        </FormGroup>
-
-        <FormGroup controlId="parentCity">
-          <ControlLabel>Parent City</ControlLabel>
-          <FormControl
-            type="text"
-            value={this.state.parentCity}
-            placeholder="Chennai"
-            onChange={e=>this.onUpdate('parentCity',e.target.value)}
-          />
-        </FormGroup>
-
-        <FormGroup controlId="parentState">
-          <ControlLabel>Parent State</ControlLabel>
-          <FormControl
-            type="text"
-            value={this.state.parentState}
-            placeholder="Tamilnadu"
-            onChange={e=>this.onUpdate('parentState',e.target.value)}
-          />
-        </FormGroup>
-
-        <FormGroup controlId="parentZipcode">
-          <ControlLabel>Parent Zipcode</ControlLabel>
-          <FormControl
-            type="text"
-            value={this.state.parentZipcode}
-            placeholder="600031"
-            onChange={e=>this.onUpdate('parentZipcode',e.target.value)}
-          />
-        </FormGroup>
-        <Button type="submit" bsStyle="default">Add Student</Button>
-      </Form>
-    );
-  };
-
-};
diff --git a/imports/client/views/org/admin/students/view/StudentTable.js b/imports/client/views/org/admin/students/view/StudentTable.js
index f7c864d..95c3216 100644
--- a/imports/client/views/org/admin/students/view/StudentTable.js
+++ b/imports/client/views/org/admin/students/view/StudentTable.js
@@ -6,7 +6,6 @@ import { Link,browserHistory }            from 'react-router';
 import { FormGroup,Panel,Table,
   ButtonToolbar,Modal,
   FormControl,Glyphicon,Button }          from 'react-bootstrap';
-  import { AddStudentForm }               from '../addStudentForm';
 import {moment}                           from 'meteor/momentjs:moment'
 import {StudentRow}                       from './StudentRow'
 
diff --git a/imports/client/views/org/admin/teachers/TeacherView.js b/imports/client/views/org/admin/teachers/TeacherView.js
index eff92ed..d72b2e9 100644
--- a/imports/client/views/org/admin/teachers/TeacherView.js
+++ b/imports/client/views/org/admin/teachers/TeacherView.js
@@ -8,7 +8,9 @@ import { FormGroup,
 import { Header }                         from '../Header';
 import { AdminSidebar }                   from '../Sidebar'
 import { AdminBreadcrumb }                from '../Breadcrumb'
-import { TeachersTable }                from './view/TeachersTable'
+import { TeachersTable }                  from './view/TeachersTable'
+import { AddTeacher }                     from './add/addTeacher'
+import { UploadCsvTeacher }               from './UploadCsvTeacher'
 
 export class TeachersView extends Component {
   constructor(props) {
@@ -24,14 +26,14 @@ export class TeachersView extends Component {
   };
 
   render() {
-    const {user, org} = this.props.data;
+    const {user, org, teachers, teachersData} = this.props.data;
     return (
       <div className="appLayout-box">
           <div className="page-container">
               <div className="page-content">
               <AdminSidebar
-                user = {this.props.data.user}
-                org = {this.props.data.org}
+                user = {user}
+                org = {org}
               />
           {/*end sidebar*/}
                   <div className="content-wrapper">
@@ -41,17 +43,16 @@ export class TeachersView extends Component {
                       <div className="content has-detached-left">
                           <div className="container-detached">
                               <div className="content-detached">
-                                  <Header/>
-                                  <TeachersTable
+                                <Header
+                                  user = {user}
+                                  org = {org}
+                                />
+                                <TeachersTable
                                     data = {this.props.data}
                                     teachers = {teachers}
                                   />
-                                {
-                                  /**
-                                  <AddTeacher/>
-                                  <UploadCsvTeacher />
-                                  */
-                                }
+                                <AddTeacher/>
+                                <UploadCsvTeacher />
                               </div>
                           </div>
                           <div className="sidebar-detached affix-top">
diff --git a/imports/client/views/org/admin/teachers/UploadCsvTeacher.js b/imports/client/views/org/admin/teachers/UploadCsvTeacher.js
new file mode 100644
index 0000000..ddac363
--- /dev/null
+++ b/imports/client/views/org/admin/teachers/UploadCsvTeacher.js
@@ -0,0 +1,103 @@
+// import {UploadCsv } from '/imports/collections/students/UploadCsv'
+import _                                  from 'lodash';
+import { Meteor }                         from 'meteor/meteor';
+
+import React, { Component }               from 'react';
+import { Link,browserHistory }            from 'react-router';
+import { FormGroup,Panel,Table,
+  ButtonToolbar,Modal,ControlLabel,HelpBlock,
+  FormControl,Glyphicon,Button }          from 'react-bootstrap';
+// import { AddStudentForm }                 from './addStudentForm';
+import { FilesCollection } from 'meteor/ostrio:files';
+const Papa = this.Papa;
+// console.log(this);
+const style = {
+  margin: 12,
+};
+function FieldGroup({ id, label, help, ...props }) {
+  return (
+    <FormGroup controlId={id}>
+      <ControlLabel>{label}</ControlLabel>
+      <FormControl {...props} />
+      {help && <HelpBlock>{help}</HelpBlock>}
+    </FormGroup>
+  );
+}
+export class UploadCsvTeacher extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      show: false
+    };
+    this.showModal = this.showModal.bind(this);
+    this.hideModal = this.hideModal.bind(this);
+    this.onUpdate = this.onUpdate.bind(this);
+  };
+
+    showModal() {
+      this.setState({show: true});
+    }
+
+    hideModal() {
+      this.setState({show: false});
+    }
+  onUpdate(key, value) {
+    this.setState({[key]: value});
+  };
+  uploadStudentCsv(e){
+    e.preventDefault();
+    e.persist();
+    var file = $('input[type="file"]').prop("files")[0];
+    Papa.parse(file, {
+      header: true,
+    	complete: function(csvData) {
+        console.log("csvData");
+        console.log(csvData);
+    		if(csvData){
+          Meteor.call('teachers.uploadCsv', csvData, function (error, result) {
+            console.log("error");
+            console.log(error);
+            console.log("result");
+            console.log(result);
+           })
+        }
+    	}
+    });
+  }
+
+  render() {
+    console.log(this.props);
+    return (
+      <ButtonToolbar>
+        <Button bsStyle="primary" onClick={this.showModal}>
+          Upload CSV
+        </Button>
+        <Modal
+          {...this.props}
+          show={this.state.show}
+          onHide={this.hideModal}
+          dialogClassName="custom-modal"
+        >
+          <Modal.Header closeButton>
+            <Modal.Title id="contained-modal-title-lg">New Student</Modal.Title>
+          </Modal.Header>
+          <Modal.Body>
+          <form onSubmit={ (e) => this.uploadStudentCsv(e) } >
+          <FieldGroup
+            id="formControlsFile"
+            type="file"
+            label="File"
+            help="Upload you CSV here."
+          />
+          <Button type="submit" bsStyle="default">Upload File</Button>
+          </form>
+          </Modal.Body>
+          <Modal.Footer>
+            <Button onClick={this.hideModal}>Close</Button>
+          </Modal.Footer>
+        </Modal>
+      </ButtonToolbar>
+    );
+  };
+
+};
diff --git a/imports/client/views/org/admin/teachers/add/AddStudentFormContainer.js b/imports/client/views/org/admin/teachers/add/AddStudentFormContainer.js
new file mode 100644
index 0000000..85ef828
--- /dev/null
+++ b/imports/client/views/org/admin/teachers/add/AddStudentFormContainer.js
@@ -0,0 +1,96 @@
+import React, { Component }               from 'react'
+import { AddStudentForm }                 from './addStudentForm'
+import StudentForm                        from './StudentForm'
+import Form                               from '/imports/client/views/core/Form'
+import Validator                          from '/imports/client/views/core/Validator'
+import { isRequired, isValidEmail }       from '/imports/client/views/core/validations'
+import { addStudentManually }             from '/imports/collections/students/methods';
+
+export class AddStudentFormContainer extends Component {
+
+  constructor(props) {
+    super(props)
+    this.state = { currentStep: 0 }
+    this.handleNextClick = this.handleNextClick.bind(this)
+    this.handleBackClick = this.handleBackClick.bind(this)
+    this.handleSubmit = this.handleSubmit.bind(this)
+  }
+
+  handleNextClick() {
+    this.form.handleSubmit()
+    if (this.validator.getErrors() && Object.keys(this.validator.getErrors()).length > 0) return
+    this.setState({ currentStep: this.state.currentStep + 1 })
+    this.form.resetSubmitted()
+  }
+
+  handleBackClick() {
+    this.setState({ currentStep: this.state.currentStep + -1 })
+  }
+
+  handleSubmit() {
+    if (this.state.currentStep === 3) {
+      addStudentManually.call(this.form.state.values)
+    }
+  }
+
+  //render callback
+  render() {
+    return (
+      <Form
+        onSubmit={this.handleSubmit}
+        ref={form => this.form = form}
+        initialValues={{
+          gender: 'male',
+          parentGender: 'male',
+        }}
+      >
+        {({ values, setValue, getValue, isSubmitted, isDirty }) => (
+          <Validator
+            values={values}
+            ref={validator => this.validator = validator}
+            validations={{
+              admissionId: [(value) => isRequired('Admission id', value)],
+              firstName: [(value) => isRequired('First name', value)],
+              lastName: [(value) => isRequired('Last name', value)],
+              email: [(value) => isRequired('Email', value), isValidEmail],
+              dob: [(value) => isRequired('Date of birth', value)],
+              gender: [(value) => isRequired('Gender', value)],
+              rollNo: [(value) => this.state.currentStep === 1 && isRequired('Roll no', value)],
+              studentClass: [(value) => this.state.currentStep === 1 && isRequired('Class', value)],
+              section: [(value) => this.state.currentStep === 1 && isRequired('Section', value)],
+              community: [(value) => this.state.currentStep === 1 && isRequired('Community', value)],
+              bloodGroup: [(value) => this.state.currentStep === 1 && isRequired('Blood group', value)],
+              phone: [(value) => this.state.currentStep === 1 && isRequired('Phone', value)],
+              address: [(value) => this.state.currentStep === 2 && isRequired('Address', value)],
+              city: [(value) => this.state.currentStep === 2 && isRequired('City', value)],
+              state: [(value) => this.state.currentStep === 2 && isRequired('State', value)],
+              parentName: [(value) => this.state.currentStep === 3 && isRequired('Parent name', value)],
+              parentEmail: [(value) => this.state.currentStep === 3 && isRequired('Parent email', value), (value) => this.state.currentStep === 3 && isValidEmail(value)],
+              relation: [(value) => this.state.currentStep === 3 && isRequired('Relation', value)],
+              profession: [(value) => this.state.currentStep === 3 && isRequired('Profession', value)],
+              parentGender: [(value) => this.state.currentStep === 3 && isRequired('Parent gender', value)],
+              parentPhone: [(value) => this.state.currentStep === 3 && isRequired('Parent phone', value)],
+              parentAddress: [(value) => this.state.currentStep === 3 && isRequired('Parent address', value)],
+              parentCity: [(value) => this.state.currentStep === 3 && isRequired('Parent city', value)],
+              parentState: [(value) => this.state.currentStep === 3 && isRequired('Parent state', value)],
+              parentZipcode: [(value) => this.state.currentStep === 3 && isRequired('Parent zip code', value)],
+            }}
+          >
+            {({ errors }) => (
+              <StudentForm
+                isDirty={isDirty}
+                setValue={setValue}
+                getValue={getValue}
+                isSubmitted={isSubmitted}
+                errors={errors}
+                onNextClick={this.handleNextClick}
+                onBackClick={this.handleBackClick}
+                currentStep={this.state.currentStep}
+              />
+            )}
+          </Validator>
+        )}
+      </Form>
+    )
+  }
+}
diff --git a/imports/client/views/org/admin/teachers/add/StudentForm.js b/imports/client/views/org/admin/teachers/add/StudentForm.js
new file mode 100644
index 0000000..2db920a
--- /dev/null
+++ b/imports/client/views/org/admin/teachers/add/StudentForm.js
@@ -0,0 +1,485 @@
+import React, { PropTypes } from 'react'
+import {
+  Row,
+  Col,
+  FormGroup,
+  FormControl,
+  Button
+} from 'react-bootstrap'
+import DatePicker from '/imports/client/views/core/DatePicker'
+import Label from '/imports/client/views/core/Label'
+import Stepper from '/imports/client/views/core/Stepper'
+import ErrorLabel from '/imports/client/views/core/ErrorLabel'
+
+const StudentForm = props => (
+  <div className="stepy-validation">
+    <Stepper
+      steps={[
+        {
+          label: 'Personal data',
+          active: props.currentStep === 0,
+        },
+        {
+          label: 'Academic',
+          active: props.currentStep === 1,
+        },
+        {
+          label: 'Address',
+          active: props.currentStep === 2,
+        },
+        {
+          label: 'Parent info',
+          active: props.currentStep === 3,
+        }
+      ]}
+    />
+    {props.currentStep === 0 && (
+      <fieldset title="1">
+        <legend className="text-semibold">Personal data</legend>
+        <Row>
+          <Col xs={12} sm={6}>
+            <FormGroup controlId="admissionId">
+              <Label required>Admission Id</Label>
+              <FormControl
+                type="text"
+                value={props.getValue('admissionId')}
+                placeholder="admission Id"
+                onChange={e => props.setValue('admissionId', e.target.value)}
+              />
+              {props.isSubmitted() && props.errors && props.errors.admissionId && (
+                <ErrorLabel> {props.errors.admissionId} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+          <Col xs={12} sm={6}>
+            <FormGroup controlId="firstName">
+              <Label required>First Name</Label>
+              <FormControl
+                type="text"
+                value={props.getValue('firstName')}
+                placeholder="First Name"
+                onChange={e => props.setValue('firstName', e.target.value)}
+              />
+              {props.isSubmitted() && props.errors && props.errors.firstName && (
+                <ErrorLabel> {props.errors.firstName} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+        </Row>
+        <Row>
+        <Col xs={12} sm={6}>
+          <FormGroup controlId="lastName">
+            <Label required>Last Name</Label>
+            <FormControl
+              type="text"
+              value={props.getValue('lastName')}
+              placeholder="Last Name"
+              onChange={e => props.setValue('lastName', e.target.value)}
+            />
+            {props.isSubmitted() && props.errors && props.errors.lastName && (
+              <ErrorLabel> {props.errors.lastName} </ErrorLabel>
+            )}
+          </FormGroup>
+        </Col>
+        <Col xs={12} sm={6}>
+          <FormGroup controlId="formControlsSelect">
+            <Label>Gender</Label>
+            <FormControl componentClass="select"
+              placeholder="select"
+              value={props.getValue('gender')}
+              onChange={e => props.setValue('gender', e.target.value)}
+              >
+              <option value="male">Male</option>
+              <option value="female">Female</option>
+            </FormControl>
+            {props.isSubmitted() && props.errors && props.errors.gender && (
+              <ErrorLabel> {props.errors.gender} </ErrorLabel>
+            )}
+          </FormGroup>
+        </Col>
+        </Row>
+        <Row>
+          <Col xs={12} sm={6}>
+            <FormGroup controlId="email">
+              <Label required>Email</Label>
+              <FormControl
+                type="email"
+                value={props.getValue('email')}
+                placeholder="Email"
+                onChange={e => props.setValue('email', e.target.value)}
+              />
+              {props.isSubmitted() && props.errors && props.errors.email && (
+                <ErrorLabel> {props.errors.email} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+          <Col xs={12} sm={6}>
+            <FormGroup>
+              <Label required>Date of birth</Label>
+              <DatePicker
+                id="dob"
+                setValue = {props.setValue}
+                value={props.getValue('dob')}
+                onChange={(e) => {
+                  props.setValue('dob', e.target.value)
+                }}
+              />
+              {props.isSubmitted() && props.errors && props.errors.dob && (
+                <ErrorLabel> {props.errors.dob} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+        </Row>
+        <Row>
+
+        </Row>
+      </fieldset>
+    )}
+    {props.currentStep === 1 && (
+      <fieldset title="Academic">
+        <legend className="text-semibold">Academic</legend>
+        <Row>
+          <Col xs={12} sm={6}>
+            <FormGroup controlId="rollNo">
+              <Label required>Roll No</Label>
+              <FormControl
+                type="text"
+                value={props.getValue('rollNo')}
+                placeholder="Roll No"
+                onChange={e => props.setValue('rollNo', e.target.value)}
+              />
+              {props.isSubmitted() && props.errors && props.errors.rollNo && (
+                <ErrorLabel> {props.errors.rollNo} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+          <Col xs={12} sm={6}>
+            <FormGroup controlId="class">
+              <Label required>Class</Label>
+              <FormControl
+                type="text"
+                value={props.getValue('studentClass')}
+                placeholder="7"
+                onChange={e => props.setValue('studentClass', e.target.value)}
+              />
+              {props.isSubmitted() && props.errors && props.errors.studentClass && (
+                <ErrorLabel> {props.errors.studentClass} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+        </Row>
+        <Row>
+          <Col xs={12} sm={6}>
+            <FormGroup controlId="section">
+              <Label required>Section</Label>
+              <FormControl
+                type="text"
+                value={props.getValue('section')}
+                placeholder="B"
+                onChange={e => props.setValue('section', e.target.value)}
+              />
+              {props.isSubmitted() && props.errors && props.errors.section && (
+                <ErrorLabel> {props.errors.section} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+          <Col xs={12} sm={6}>
+            <FormGroup controlId="community">
+              <Label required>Community</Label>
+              <FormControl
+                type="text"
+                value={props.getValue('community')}
+                placeholder="General"
+                onChange={e => props.setValue('community', e.target.value)}
+              />
+              {props.isSubmitted() && props.errors && props.errors.community && (
+                <ErrorLabel> {props.errors.community} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+        </Row>
+        <Row>
+          <Col xs={12} sm={6}>
+            <FormGroup controlId="bloodGroup">
+              <Label required>bloodGroup</Label>
+              <FormControl
+                type="text"
+                value={props.getValue('bloodGroup')}
+                placeholder="B+"
+                onChange={e => props.setValue('bloodGroup', e.target.value)}
+              />
+              {props.isSubmitted() && props.errors && props.errors.bloodGroup && (
+                <ErrorLabel> {props.errors.bloodGroup} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+          <Col xs={12} sm={6}>
+            <FormGroup controlId="phone">
+              <Label required>Phone</Label>
+              <FormControl
+                type="text"
+                value={props.getValue('phone')}
+                placeholder="9999999999"
+                onChange={e => props.setValue('phone', e.target.value)}
+              />
+              {props.isSubmitted() && props.errors && props.errors.phone && (
+                <ErrorLabel> {props.errors.phone} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+        </Row>
+      </fieldset>
+    )}
+    {props.currentStep === 2 && (
+      <fieldset title="Address">
+        <legend className="text-semibold">Address</legend>
+        <Row>
+          <Col xs={12} sm={6}>
+            <FormGroup controlId="address">
+              <Label required>Address</Label>
+              <FormControl
+                type="text"
+                value={props.getValue('address')}
+                placeholder="#876, Street, town"
+                onChange={e => props.setValue('address', e.target.value)}
+              />
+              {props.isSubmitted() && props.errors && props.errors.address && (
+                <ErrorLabel> {props.errors.address} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+          <Col xs={12} sm={6}>
+            <FormGroup controlId="city">
+              <Label required>City</Label>
+              <FormControl
+                type="text"
+                value={props.getValue('city')}
+                placeholder="Chennai"
+                onChange={e => props.setValue('city', e.target.value)}
+              />
+              {props.isSubmitted() && props.errors && props.errors.city && (
+                <ErrorLabel> {props.errors.city} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+        </Row>
+        <Row>
+          <Col xs={12} sm={6}>
+            <FormGroup controlId="state">
+              <Label required>State</Label>
+              <FormControl
+                type="text"
+                value={props.getValue('state')}
+                placeholder="Tamilnadu"
+                onChange={e => props.setValue('state', e.target.value)}
+              />
+              {props.isSubmitted() && props.errors && props.errors.state && (
+                <ErrorLabel> {props.errors.state} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+        </Row>
+      </fieldset>
+    )}
+    {props.currentStep === 3 && (
+      <fieldset title="2">
+        <legend className="text-semibold">Parent information</legend>
+        <Row>
+          <Col xs={12} sm={6}>
+            <FormGroup controlId="parentName">
+              <Label required>Parent Name</Label>
+              <FormControl
+                type="text"
+                value={props.getValue('parentName')}
+                placeholder="John"
+                onChange={e => props.setValue('parentName', e.target.value)}
+              />
+              {props.isSubmitted() && props.errors && props.errors.parentName && (
+                <ErrorLabel> {props.errors.parentName} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+          <Col xs={12} sm={6}>
+            <FormGroup controlId="parentEmail">
+              <Label required>Parent Email</Label>
+              <FormControl
+                type="text"
+                value={props.getValue('parentEmail')}
+                placeholder="john@email.com"
+                onChange={e => props.setValue('parentEmail', e.target.value)}
+              />
+              {props.isSubmitted() && props.errors && props.errors.parentEmail && (
+                <ErrorLabel> {props.errors.parentEmail} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+        </Row>
+        <Row>
+          <Col xs={12} sm={6}>
+            <FormGroup controlId="relation">
+              <Label required>Relation</Label>
+              <FormControl
+                type="text"
+                value={props.getValue('relation')}
+                placeholder="Father"
+                onChange={e => props.setValue('relation', e.target.value)}
+              />
+              {props.isSubmitted() && props.errors && props.errors.relation && (
+                <ErrorLabel> {props.errors.relation} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+          <Col xs={12} sm={6}>
+            <FormGroup controlId="profession">
+              <Label required>Profession</Label>
+              <FormControl
+                type="text"
+                value={props.getValue('profession')}
+                placeholder="Farmer"
+                onChange={e => props.setValue('profession', e.target.value)}
+              />
+              {props.isSubmitted() && props.errors && props.errors.profession && (
+                <ErrorLabel> {props.errors.profession} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+        </Row>
+        <Row>
+          <Col xs={12} sm={6}>
+            <FormGroup controlId="parentGender">
+              <Label>Parent Gender</Label>
+              <FormControl componentClass="select"
+                placeholder="select"
+                value={props.getValue('parentGender')}
+                onChange={e => props.setValue('parentGender', e.target.value)}
+                >
+                <option value="male">Male</option>
+                <option value="female">Female</option>
+              </FormControl>
+              {props.isSubmitted() && props.errors && props.errors.parentGender && (
+                <ErrorLabel> {props.errors.parentGender} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+          <Col xs={12} sm={6}>
+            <FormGroup controlId="parentPhone">
+              <Label required>Parent Phone</Label>
+              <FormControl
+                type="text"
+                value={props.getValue('parentPhone')}
+                placeholder="9876543210"
+                onChange={e => props.setValue('parentPhone', e.target.value)}
+              />
+              {props.isSubmitted() && props.errors && props.errors.parentPhone && (
+                <ErrorLabel> {props.errors.parentPhone} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+        </Row>
+        <Row>
+          <Col xs={12} sm={6}>
+            <FormGroup controlId="parentAddress">
+              <Label required>Parent Address</Label>
+              <FormControl
+                type="text"
+                value={props.getValue('parentAddress')}
+                placeholder="#12, street, town"
+                onChange={e => props.setValue('parentAddress', e.target.value)}
+              />
+              {props.isSubmitted() && props.errors && props.errors.parentAddress && (
+                <ErrorLabel> {props.errors.parentAddress} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+          <Col xs={12} sm={6}>
+            <FormGroup controlId="parentCity">
+              <Label required>Parent City</Label>
+              <FormControl
+                type="text"
+                value={props.getValue('parentCity')}
+                placeholder="Chennai"
+                onChange={e => props.setValue('parentCity', e.target.value)}
+              />
+              {props.isSubmitted() && props.errors && props.errors.parentCity && (
+                <ErrorLabel> {props.errors.parentCity} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+        </Row>
+        <Row>
+        <Col xs={12} sm={6}>
+          <FormGroup controlId="parentState">
+            <Label required>Parent State</Label>
+            <FormControl
+              type="text"
+              value={props.getValue('parentState')}
+              placeholder="600031"
+              onChange={e => props.setValue('parentState', e.target.value)}
+            />
+            {props.isSubmitted() && props.errors && props.errors.parentState && (
+              <ErrorLabel> {props.errors.parentState} </ErrorLabel>
+            )}
+          </FormGroup>
+        </Col>
+          <Col xs={12} sm={6}>
+            <FormGroup controlId="parentZipcode">
+              <Label required>Parent Zipcode</Label>
+              <FormControl
+                type="text"
+                value={props.getValue('parentZipcode')}
+                placeholder="600031"
+                onChange={e => props.setValue('parentZipcode', e.target.value)}
+              />
+              {props.isSubmitted() && props.errors && props.errors.parentZipcode && (
+                <ErrorLabel> {props.errors.parentZipcode} </ErrorLabel>
+              )}
+            </FormGroup>
+          </Col>
+        </Row>
+      </fieldset>
+    )}
+    <div style={{ textAlign: 'left' }}>
+      {props.currentStep > 0 && (
+        <div style={{ display: 'inline-block', marginRight: 10 }}>
+          <Button onClick={props.onBackClick}>
+            <i className="icon-arrow-left13 position-left"></i>
+            BACK
+          </Button>
+
+        </div>
+      )}
+      {props.currentStep < 3 && (
+        <div style={{ display: 'inline-block' }}>
+          <Button
+            bsStyle="primary"
+            onClick={props.onNextClick}
+          >
+            NEXT
+            <i className="icon-arrow-right14 position-right" />
+          </Button>
+        </div>
+      )}
+      {props.currentStep === 3 && (
+        <div style={{ display: 'inline-block' }}>
+          <Button
+            bsStyle="primary"
+            onClick={props.onNextClick}
+          >
+            SAVE
+            <i className="fa fa-check" />
+          </Button>
+        </div>
+      )}
+    </div>
+  </div>
+)
+
+StudentForm.propTypes = {
+  currentStep: PropTypes.number.isRequired,
+  onNextClick: PropTypes.func.isRequired,
+  onBackClick: PropTypes.func.isRequired,
+  setValue: PropTypes.func.isRequired,
+  getValue: PropTypes.func.isRequired,
+}
+
+export default StudentForm
diff --git a/imports/client/views/org/admin/teachers/add/addStudentForm.js b/imports/client/views/org/admin/teachers/add/addStudentForm.js
new file mode 100644
index 0000000..9f41e25
--- /dev/null
+++ b/imports/client/views/org/admin/teachers/add/addStudentForm.js
@@ -0,0 +1,500 @@
+import _                                  from 'lodash';
+import { Meteor }                         from 'meteor/meteor';
+
+import React, { Component }               from 'react';
+import { Link,browserHistory }            from 'react-router';
+import { Form, FormGroup,InputGroup,
+  DropdownButton,MenuItem,ControlLabel,
+  SplitButton,
+  FormControl,Glyphicon,Button }          from 'react-bootstrap';
+import DatePicker                         from 'react-bootstrap-date-picker'
+import {addStudentManually}               from '/imports/collections/students/methods';
+
+export class AddStudentForm extends Component {
+
+  constructor(props) {
+    super(props);
+    this.state = {
+      admissionId:    "123",
+      firstName:      "first",
+      lastName:       "last",
+      middleName:     "middle",
+      email:          "deepak125.dk+21@gmail.com",
+      dob:            "",
+      formattedDob:   "",
+      gender:         "male",
+      rollNo:         "1",
+      class:          "2",
+      section:        "B",
+      community:      "SC",
+      bloodGroup:     "B+",
+      phone:          "9876543321",
+      address:        "address",
+      city:           "chennai",
+      state:          "tn",
+      parentName:     "parentName",
+      parentEmail:    "deepak125.dk+41@gmail.com",
+      relation:       "father",
+      profession:     "farmer",
+      parentGender:   "male",
+      parentPhone:    "987655412",
+      parentAddress:  "parentAddress",
+      parentCity:     "parentCity",
+      parentState:    "parentState",
+      parentZipcode:  "parentZipcode",
+    };
+    this.onUpdate = this.onUpdate.bind(this);
+    this.handleDob = this.handleDob.bind(this);
+  };
+
+  onUpdate(key, value) {
+    this.setState({[key]: value});
+  };
+
+  handleDob(value, formattedValue) {
+  this.setState({
+    dob: value, // ISO String, ex: "2016-11-19T12:00:00.000Z"
+    formattedDob: formattedValue // Formatted String, ex: "11/19/2016"
+  });
+}
+  addStudent(e){
+    e.preventDefault();
+    e.persist();
+    const firstName   = this.state.firstName;
+    const middleName  = this.state.middleName;
+    const lastName = this.state.lastName;
+    const admissionId = this.state.admissionId;
+    const email = this.state.email;
+    const dob = this.state.dob;
+    const formattedDob = this.state.formattedDob;
+    const gender = this.state.gender;
+    const rollNo = this.state.rollNo;
+    const studentclass = this.state.class;
+    const section = this.state.section;
+    const community = this.state.community;
+    const bloodGroup = this.state.bloodGroup;
+    const phone = this.state.phone;
+    const address = this.state.address;
+    const city = this.state.city;
+    const state = this.state.state;
+    const parentName = this.state.parentName;
+    const parentEmail = this.state.parentEmail;
+    const relation = this.state.relation;
+    const profession = this.state.profession;
+    const parentGender = this.state.parentGender;
+    const parentPhone = this.state.parentPhone;
+    const parentAddress = this.state.parentAddress;
+    const parentCity = this.state.parentCity;
+    const parentState = this.state.parentState;
+    const parentZipcode = this.state.parentZipcode;
+    if(admissionId==""){
+          Bert.alert('Enter Admission Id!', 'danger');
+    }else if(firstName==""){
+      Bert.alert('Enter Fist Name', 'danger');
+    } else if(middleName==""){
+          Bert.alert('Enter Middle name!', 'danger');
+    }else if(lastName==""){
+          Bert.alert('Enter Last name!', 'danger');
+    }else if(email==""){
+          Bert.alert('Enter email!', 'danger');
+    }else if(dob==""){
+          Bert.alert('Enter DOB!', 'danger');
+    }else if(gender==""){
+          Bert.alert('Enter Student Gender!', 'danger');
+    }else if(studentclass==""){
+          Bert.alert('Enter Class!', 'danger');
+    }else if(section==""){
+          Bert.alert('Enter Section!', 'danger');
+    }else if(community==""){
+          Bert.alert('Enter Section!', 'danger');
+    }else if(bloodGroup==""){
+          Bert.alert('Enter Blood Group!', 'danger');
+    }else if(phone==""){
+          Bert.alert('Enter phone!', 'danger');
+    }else if(address==""){
+          Bert.alert('Enter address!', 'danger');
+    }else if(city==""){
+          Bert.alert('Enter city!', 'danger');
+    }else if(state==""){
+          Bert.alert('Enter state!', 'danger');
+    }else if(parentName==""){
+          Bert.alert('Enter Parent name!', 'danger');
+    }else if(parentEmail==""){
+          Bert.alert('Enter Parent Email!', 'danger');
+    }else if(relation==""){
+          Bert.alert('Enter relation!', 'danger');
+    }else if(profession==""){
+          Bert.alert('Enter parent profession!', 'danger');
+    }else if(parentGender==""){
+          Bert.alert("Enter Parent's Gender!", 'danger');
+    }else if(parentPhone==""){
+          Bert.alert("Enter Parent's Phone!", 'danger');
+    }else if(parentAddress==""){
+          Bert.alert("Enter Parent's Address!", 'danger');
+    }else if(parentCity==""){
+          Bert.alert("Enter Parent's City!", 'danger');
+    }else if(parentState==""){
+          Bert.alert("Enter Parent's State!", 'danger');
+    }else if(parentZipcode==""){
+          Bert.alert("Enter Parent's zipcode!", 'danger');
+    }else{
+      addStudentManually.call({
+        admissionId,
+        firstName,
+        middleName,
+        lastName,
+        email,
+        dob,
+        formattedDob,
+        gender,
+        rollNo,
+        studentclass,
+        section,
+        community,
+        bloodGroup,
+        phone,
+        address,
+        city,
+        state,
+        parentName,
+        parentEmail,
+        relation,
+        profession,
+        parentGender,
+        parentPhone,
+        parentAddress,
+        parentCity,
+        parentState,
+        parentZipcode
+      }, function (error, result) {
+        console.log(error);
+          console.log(result);
+       });
+    }
+  }
+  render() {
+    return (
+      <Form className="steps-validation wizard clearfix" onSubmit={ (e) => this.addStudent(e) } inline>
+        <div className="steps clearfix">
+            <ul role="tablist">
+                <li role="tab" className="first current" aria-disabled="false" aria-selected="true">
+                    <a id="steps-uid-4-t-0" href="#steps-uid-4-h-0" aria-controls="steps-uid-4-p-0">
+                        <span className="current-info audible">current step: </span><span className="number">1</span> Personal data
+                    </a>
+                </li>
+                <li role="tab" className="disabled" aria-disabled="true">
+                    <a id="steps-uid-4-t-1" href="#steps-uid-4-h-1" aria-controls="steps-uid-4-p-1">
+                        <span className="number">2</span> Your education\n\
+                    </a>
+                </li>
+                <li role="tab" className="disabled" aria-disabled="true">
+                    <a id="steps-uid-4-t-2" href="#steps-uid-4-h-2" aria-controls="steps-uid-4-p-2">
+                        <span className="number">3</span> Your experience
+                    </a>
+                </li>
+                <li role="tab" className="disabled last" aria-disabled="true">
+                    <a id="steps-uid-4-t-3" href="#steps-uid-4-h-3" aria-controls="steps-uid-4-p-3">
+                        <span className="number">4</span> Additional info
+                    </a>
+                </li>
+            </ul>
+        </div>
+        <div className="content clearfix">
+            <h6 id="steps-uid-4-h-0" tabindex="-1" className="title current">Personal data</h6>
+            <div id="steps-uid-4-p-0" role="tabpanel" aria-labelledby="steps-uid-4-h-0" className="body current">
+                <div className="row">
+                    <div className="col-md-6">
+                        
+                            <FormGroup controlId="admissionId">
+                              <ControlLabel>Admission Id</ControlLabel>
+                              <FormControl
+                                type="text"
+                                value={this.state.admissionId}
+                                placeholder="admission Id"
+                                onChange={e=>this.onUpdate('admissionId',e.target.value)}
+                              />
+                            </FormGroup>
+
+                    </div>
+                    
+                    <div className="col-md-6">
+                    
+                            <FormGroup controlId="firstName">
+                              <ControlLabel>First Name</ControlLabel>
+                              <FormControl
+                                type="text"
+                                value={this.state.firstName}
+                                placeholder="First Name"
+                                onChange={e=>this.onUpdate('firstName',e.target.value)}
+                              />
+                            </FormGroup>
+                            
+                    </div>
+                </div>
+            </div>
+        </div>
+        
+      
+        <FormGroup controlId="admissionId">
+          <ControlLabel>Admission Id</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.admissionId}
+            placeholder="admission Id"
+            onChange={e=>this.onUpdate('admissionId',e.target.value)}
+          />
+        </FormGroup>
+
+        <FormGroup controlId="firstName">
+          <ControlLabel>First Name</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.firstName}
+            placeholder="First Name"
+            onChange={e=>this.onUpdate('firstName',e.target.value)}
+          />
+        </FormGroup>
+        <FormGroup controlId="middleName">
+          <ControlLabel>Middle Name</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.middleName}
+            placeholder="Middle Name"
+            onChange={e=>this.onUpdate('middleName',e.target.value)}
+          />
+        </FormGroup>
+
+        <FormGroup controlId="lastName">
+          <ControlLabel>Last Name</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.lastName}
+            placeholder="Last Name"
+            onChange={e=>this.onUpdate('lastName',e.target.value)}
+          />
+
+        </FormGroup>
+        <FormGroup controlId="email">
+          <ControlLabel>Email</ControlLabel>
+          <FormControl
+            type="email"
+            value={this.state.email}
+            placeholder="Email"
+            onChange={e=>this.onUpdate('email',e.target.value)}
+          />
+        </FormGroup>
+        <FormGroup>
+          <ControlLabel>Date of birth</ControlLabel>
+          <DatePicker id="dob"
+          value={this.state.dob}
+          onChange={this.handleDob}
+          />
+        </FormGroup>
+
+        <FormGroup controlId="formControlsSelect">
+          <ControlLabel>Gender</ControlLabel>
+          <FormControl componentClass="select"
+            placeholder="select"
+            value={this.state.gender}
+            onChange={e=>this.onUpdate('gender',e.target.value)}
+            >
+            <option value="male">Male</option>
+            <option value="female">Female</option>
+          </FormControl>
+        </FormGroup>
+
+        <FormGroup controlId="rollNo">
+          <ControlLabel>Roll No</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.rollNo}
+            placeholder="Roll No"
+            onChange={e=>this.onUpdate('rollNo',e.target.value)}
+          />
+        </FormGroup>
+        <FormGroup controlId="class">
+          <ControlLabel>Class</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.class}
+            placeholder="7"
+            onChange={e=>this.onUpdate('class',e.target.value)}
+          />
+        </FormGroup>
+        <FormGroup controlId="section">
+          <ControlLabel>Section</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.section}
+            placeholder="B"
+            onChange={e=>this.onUpdate('section',e.target.value)}
+          />
+        </FormGroup>
+
+        <FormGroup controlId="community">
+          <ControlLabel>Community</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.community}
+            placeholder="General"
+            onChange={e=>this.onUpdate('community',e.target.value)}
+          />
+        </FormGroup>
+
+        <FormGroup controlId="bloodGroup">
+          <ControlLabel>bloodGroup</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.bloodGroup}
+            placeholder="B+"
+            onChange={e=>this.onUpdate('bloodGroup',e.target.value)}
+          />
+        </FormGroup>
+
+        <FormGroup controlId="phone">
+          <ControlLabel>Phone</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.phone}
+            placeholder="9999999999"
+            onChange={e=>this.onUpdate('phone',e.target.value)}
+          />
+        </FormGroup>
+
+        <FormGroup controlId="address">
+          <ControlLabel>Address</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.address}
+            placeholder="#876, Street, town"
+            onChange={e=>this.onUpdate('address',e.target.value)}
+          />
+        </FormGroup>
+
+        <FormGroup controlId="city">
+          <ControlLabel>City</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.city}
+            placeholder="Chennai"
+            onChange={e=>this.onUpdate('city',e.target.value)}
+          />
+        </FormGroup>
+
+        <FormGroup controlId="state">
+          <ControlLabel>State</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.state}
+            placeholder="Tamilnadu"
+            onChange={e=>this.onUpdate('state',e.target.value)}
+          />
+        </FormGroup>
+
+        <FormGroup controlId="parentName">
+          <ControlLabel>Parent Name</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.parentName}
+            placeholder="John"
+            onChange={e=>this.onUpdate('parentName',e.target.value)}
+          />
+        </FormGroup>
+
+        <FormGroup controlId="parentEmail">
+          <ControlLabel>Parent Email</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.parentEmail}
+            placeholder="john@email.com"
+            onChange={e=>this.onUpdate('parentEmail',e.target.value)}
+          />
+        </FormGroup>
+
+        <FormGroup controlId="relation">
+          <ControlLabel>Relation</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.relation}
+            placeholder="Father"
+            onChange={e=>this.onUpdate('relation',e.target.value)}
+          />
+        </FormGroup>
+
+        <FormGroup controlId="profession">
+          <ControlLabel>Profession</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.profession}
+            placeholder="Farmer"
+            onChange={e=>this.onUpdate('profession',e.target.value)}
+          />
+        </FormGroup>
+
+        <FormGroup controlId="parentGender">
+          <ControlLabel>Parent Gender</ControlLabel>
+          <FormControl componentClass="select"
+            placeholder="select"
+            value={this.state.parentGender}
+            onChange={e=>this.onUpdate('parentGender',e.target.value)}
+            >
+            <option value="male">Male</option>
+            <option value="female">Female</option>
+          </FormControl>
+        </FormGroup>
+
+        <FormGroup controlId="parentPhone">
+          <ControlLabel>Parent Phone</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.parentPhone}
+            placeholder="9876543210"
+            onChange={e=>this.onUpdate('parentPhone',e.target.value)}
+          />
+        </FormGroup>
+
+        <FormGroup controlId="parentAddress">
+          <ControlLabel>Parent Address</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.parentAddress}
+            placeholder="#12, street, town"
+            onChange={e=>this.onUpdate('parentAddress',e.target.value)}
+          />
+        </FormGroup>
+
+        <FormGroup controlId="parentCity">
+          <ControlLabel>Parent City</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.parentCity}
+            placeholder="Chennai"
+            onChange={e=>this.onUpdate('parentCity',e.target.value)}
+          />
+        </FormGroup>
+
+        <FormGroup controlId="parentState">
+          <ControlLabel>Parent State</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.parentState}
+            placeholder="Tamilnadu"
+            onChange={e=>this.onUpdate('parentState',e.target.value)}
+          />
+        </FormGroup>
+
+        <FormGroup controlId="parentZipcode">
+          <ControlLabel>Parent Zipcode</ControlLabel>
+          <FormControl
+            type="text"
+            value={this.state.parentZipcode}
+            placeholder="600031"
+            onChange={e=>this.onUpdate('parentZipcode',e.target.value)}
+          />
+        </FormGroup>
+        <Button type="submit" bsStyle="default">Add Student</Button>
+      </Form>
+    );
+  };
+
+};
diff --git a/imports/client/views/org/admin/teachers/add/addTeacher.js b/imports/client/views/org/admin/teachers/add/addTeacher.js
new file mode 100644
index 0000000..6b3b7de
--- /dev/null
+++ b/imports/client/views/org/admin/teachers/add/addTeacher.js
@@ -0,0 +1,63 @@
+import _                                  from 'lodash';
+import { Meteor }                         from 'meteor/meteor';
+import React, { Component }               from 'react';
+import { Link,browserHistory }            from 'react-router';
+import { FormGroup,Panel,Table,
+  ButtonToolbar,Modal,
+  FormControl,Glyphicon,Button }          from 'react-bootstrap';
+import { AddStudentFormContainer }        from './AddStudentFormContainer';
+
+const style = {
+  margin: 12,
+};
+export class AddTeacher extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      show: false
+    };
+    this.showModal = this.showModal.bind(this);
+    this.hideModal = this.hideModal.bind(this);
+    this.onUpdate = this.onUpdate.bind(this);
+  };
+
+    showModal() {
+      this.setState({show: true});
+    }
+
+    hideModal() {
+      this.setState({show: false});
+    }
+  onUpdate(key, value) {
+    this.setState({[key]: value});
+  };
+
+  render() {
+    return (
+      <ButtonToolbar>
+        <Button bsStyle="primary" onClick={this.showModal}>
+          Add Student
+        </Button>
+        <Modal
+          {...this.props}
+          show={this.state.show}
+          onHide={this.hideModal}
+          dialogClassName="custom-modal"
+        >
+          <Modal.Header closeButton>
+            <Modal.Title id="contained-modal-title-lg">New Student</Modal.Title>
+          </Modal.Header>
+          <Modal.Body>
+            <AddStudentFormContainer />
+          </Modal.Body>
+  {/*
+          <Modal.Footer>
+            <Button onClick={this.hideModal}>Close</Button>
+          </Modal.Footer>
+          */}
+        </Modal>
+      </ButtonToolbar>
+    );
+  };
+
+};