diff --git a/imports/client/views/nonOrg/app/module/AppLayout.js b/imports/client/views/nonOrg/app/module/AppLayout.js
index b6d2669..49ff8f8 100644
--- a/imports/client/views/nonOrg/app/module/AppLayout.js
+++ b/imports/client/views/nonOrg/app/module/AppLayout.js
@@ -7,6 +7,7 @@ import { Icon }                           from '/imports/client/components/Icon'
 import classNames                         from 'classnames';
 
 import { logout }                         from '/imports/client/app/utils/loginMethods';
+import { VerifyModule }                   from '/imports/client/views/verify/module/index'
 
 import Signup                             from '/imports/client/views/nonOrg/enter/SignupView';
 import { Collapse, Navbar, NavbarToggler,
diff --git a/imports/client/views/nonOrg/enter/SignupView.js b/imports/client/views/nonOrg/enter/SignupView.js
index 1504022..fce0b97 100644
--- a/imports/client/views/nonOrg/enter/SignupView.js
+++ b/imports/client/views/nonOrg/enter/SignupView.js
@@ -5,6 +5,7 @@ import { Row, Col, FormGroup,
   InputGroup, Button }                    from 'react-bootstrap';
 import handleSignup                       from './signup';
 import { Orgs }                           from '/imports/collections/orgs/index';
+import './signup.css'
 
 export default class Signup extends React.Component {
   constructor(props) {
diff --git a/imports/client/views/nonOrg/enter/signup.css b/imports/client/views/nonOrg/enter/signup.css
new file mode 100644
index 0000000..9869375
--- /dev/null
+++ b/imports/client/views/nonOrg/enter/signup.css
@@ -0,0 +1,5 @@
+.Signup .row div{
+  display: block;
+    margin: auto;
+    left: 27%;
+}
diff --git a/imports/client/views/org/admin/students/StudentTable.js b/imports/client/views/org/admin/students/StudentTable.js
index 51d273c..7fe9c4d 100644
--- a/imports/client/views/org/admin/students/StudentTable.js
+++ b/imports/client/views/org/admin/students/StudentTable.js
@@ -7,6 +7,7 @@ import { FormGroup,Panel,Table,
   ButtonToolbar,Modal,
   FormControl,Glyphicon,Button }          from 'react-bootstrap';
   import { AddStudentForm }               from './addStudentForm';
+import {moment}                           from 'meteor/momentjs:moment'
 
 export class StudentTable extends Component {
 
@@ -53,7 +54,7 @@ export class StudentTable extends Component {
                       <td>{student.firstName}</td>
                       <td>{student.lastName}</td>
                       <td>{student.class}</td>
-                      <td>{}</td>
+                      <td>{student.dob? moment(student.dob).format("LL") : <span></span>}</td>
                       <td><span className="label label-success">Active</span></td>
                       <td className="text-center">
                         <ul className="icons-list">
diff --git a/imports/client/views/org/admin/students/StudentView.js b/imports/client/views/org/admin/students/StudentView.js
index 4f62735..25a30c2 100644
--- a/imports/client/views/org/admin/students/StudentView.js
+++ b/imports/client/views/org/admin/students/StudentView.js
@@ -11,6 +11,7 @@ import { StudentTable }                   from './StudentTable';
 import { Header }                         from './Header';
 import { FabMenuView }                    from './FabMenu';
 import { UploadCsv }                      from './UploadCsv';
+import { Students }                       from '/imports/collections/students/index';
 
 
 export class StudentView extends Component {
@@ -39,7 +40,9 @@ export class StudentView extends Component {
   };
 
   render() {
+    console.log(this.props);
     firstNameSearch = this.state.firstNameSearch;
+    lastNameSearch = this.state.lastNameSearch;
     var students =_.filter(this.props.data.students,function(item){
       return _.includes(item.firstName.toLowerCase(),firstNameSearch.toLowerCase());
     });
diff --git a/imports/client/views/org/admin/students/UploadCsv.js b/imports/client/views/org/admin/students/UploadCsv.js
index 63633fa..94d6b30 100644
--- a/imports/client/views/org/admin/students/UploadCsv.js
+++ b/imports/client/views/org/admin/students/UploadCsv.js
@@ -4,13 +4,22 @@ import { Meteor }                         from 'meteor/meteor';
 import React, { Component }               from 'react';
 import { Link,browserHistory }            from 'react-router';
 import { FormGroup,Panel,Table,
-  ButtonToolbar,Modal, FieldGroup,
+  ButtonToolbar,Modal,ControlLabel,HelpBlock,
   FormControl,Glyphicon,Button }          from 'react-bootstrap';
-import { AddStudentForm }               from './addStudentForm';
+// import { AddStudentForm }                 from './addStudentForm';
 
 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 UploadCsv extends Component {
   constructor(props) {
     super(props);
@@ -34,6 +43,7 @@ export class UploadCsv extends Component {
   };
 
   render() {
+    console.log(this.props);
     return (
       <ButtonToolbar>
         <Button bsStyle="primary" onClick={this.showModal}>
@@ -49,12 +59,14 @@ export class UploadCsv extends Component {
             <Modal.Title id="contained-modal-title-lg">New Student</Modal.Title>
           </Modal.Header>
           <Modal.Body>
+          <form>
           <FieldGroup
             id="formControlsFile"
             type="file"
             label="File"
             help="Example block-level help text here."
           />
+          </form>
           </Modal.Body>
           <Modal.Footer>
             <Button onClick={this.hideModal}>Close</Button>
diff --git a/imports/client/views/org/admin/students/index.js b/imports/client/views/org/admin/students/index.js
index 2cfb899..ad61543 100644
--- a/imports/client/views/org/admin/students/index.js
+++ b/imports/client/views/org/admin/students/index.js
@@ -25,15 +25,22 @@ const meteorTick = (props, onData) => {
   if(_.every(handles, (handle) => (handle.ready()) )) {
     const user = Users.current();
     const org = Orgs.current();
-    const students = Users.find({"role":"STUDENT"}).fetch();
-    const StudentData = Students.find().fetch();
-    console.log("StudentData");
-    console.log(StudentData);
+    students = Users.find({"role":"STUDENT"}).fetch();
+    studentData = Students.find().fetch();
+    for(var i=0; i< students.length; i++){
+      for(var j=0; j< studentData.length; j++){
+        if(students[i]._id == studentData[j].userId){
+          students[i].class = studentData[j].class;
+          students[i].dob = studentData[j].dob;
+        }
+      }
+    }
     onData(null, {
       data: {
-        user: user,
-        org: org,
-        students:students
+        user:         user,
+        org:          org,
+        students:     students,
+        studentData:  studentData
       },
     });
   }
diff --git a/imports/client/views/org/app/module/AppLayout.js b/imports/client/views/org/app/module/AppLayout.js
index 833282e..eeba77f 100644
--- a/imports/client/views/org/app/module/AppLayout.js
+++ b/imports/client/views/org/app/module/AppLayout.js
@@ -8,11 +8,12 @@ import classNames                         from 'classnames';
 import { EnterModule }                    from '/imports/client/views/org/enter/module/index';
 // import { VerifyModule }                   from '/imports/client/views/verify/module/index';
 import { Navbar,Modal, Nav, NavItem,
-  Glyphicon, Collapse, 
+  Glyphicon, Collapse,
   NavbarToggler, NavbarBrand,
   NavLink, DropdownItem, DropdownToggle, DropdownMenu,
   NavDropdown, MenuItem }                 from 'react-bootstrap';
-  
+  import { VerifyModule }                   from '/imports/client/views/verify/module/index'
+
 var Accordion = require('react-bootstrap').Accordion;
 var Panel = require('react-bootstrap').Panel;
 export class AppLayout extends Component {
@@ -29,27 +30,35 @@ export class AppLayout extends Component {
         />
       );
     }
+    if(!user.isEmailVerified()) {
+      return (
+        <VerifyModule
+          pane      = {this.props.location.query.verify}
+          location  = {this.props.location}
+        />
+      );
+    }
     return (
-        
+
       <div className = "appLayout-box">
         <div className="page-container">
             <div className="page-content">
                 <div className="sidebar sidebar-main sidebar-default">
                     <div className="sidebar-content">
-                            
+
                         <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="active" eventKey={1} href="#"><i className="icon-home4"></i> <span>Dashboard</span></NavItem>
-                                   
+
                                     <NavDropdown eventKey={2} title="Settings" id="setting">
                                         <MenuItem eventKey={2.1}>Information</MenuItem>
                                         <MenuItem eventKey={2.2}>Infrastructure</MenuItem>
                                         <MenuItem eventKey={2.3}>Users</MenuItem>
                                         <MenuItem eventKey={2.4}>Academic Settings</MenuItem>
                                         <MenuItem eventKey={2.5}>Account Configuration</MenuItem>
-                                         
+
                                     </NavDropdown>
                                     <li>
                                         <a href="#"><i className="icon-copy"></i> <span>Academic</span></a>
@@ -154,7 +163,7 @@ export class AppLayout extends Component {
                     </div>
                 </div>
                         {/*end content*/}
-                        
+
             </div>
         </div>