diff --git a/imports/client/views/org/admin/students/StudentTable.js b/imports/client/views/org/admin/students/StudentTable.js
index f7b8c86..9da2f13 100644
--- a/imports/client/views/org/admin/students/StudentTable.js
+++ b/imports/client/views/org/admin/students/StudentTable.js
@@ -28,13 +28,11 @@ export class StudentTable extends Component {
           <h5 className="panel-title">Student Details</h5>
           <div className="heading-elements">
             <ul className="icons-list">
-                      <li><a data-action="collapse"></a></li>
-                      <li><a data-action="reload"></a></li>
-                    </ul>
-                  </div>
+              <li><a data-action="collapse"></a></li>
+              <li><a data-action="reload"></a></li>
+            </ul>
+          </div>
         </div>
-
-
         <Table striped bordered condensed hover>
           <thead>
             <tr>
@@ -47,57 +45,34 @@ export class StudentTable extends Component {
             </tr>
           </thead>
           <tbody>
-          {
-            this.props.data.students.map(function(student, i)
-              {
-                return(
-                  <tr key={i}>
-              <td>{student.firstName}</td>
-              <td>{student.lastName}</td>
-              <td>VII</td>
-              <td>22 Jun 1972</td>
-              <td><span className="label label-success">Active</span></td>
-              <td className="text-center">
-                <ul className="icons-list">
-                  <li className="dropdown">
-                    <a href="#" className="dropdown-toggle" data-toggle="dropdown">
-                      <i className="icon-menu9"></i>
-                    </a>
-
-                    <ul className="dropdown-menu dropdown-menu-right">
-                      <li><a href="#"><i className="icon-file-pdf"></i> Export to .pdf</a></li>
-                      <li><a href="#"><i className="icon-file-excel"></i> Export to .csv</a></li>
-                      <li><a href="#"><i className="icon-file-word"></i> Export to .doc</a></li>
-                    </ul>
-                  </li>
-                </ul>
-              </td>
-            </tr>
-          )
-        })
-      }
-            <tr>
-              <td>Jackelyn</td>
-              <td>Weible</td>
-              <td><a href="#">XI</a></td>
-              <td>3 Oct 1981</td>
-              <td><span className="label label-default">Inactive</span></td>
-              <td className="text-center">
-                <ul className="icons-list">
-                  <li className="dropdown">
-                    <a href="#" className="dropdown-toggle" data-toggle="dropdown">
-                      <i className="icon-menu9"></i>
-                    </a>
-
-                    <ul className="dropdown-menu dropdown-menu-right">
-                      <li><a href="#"><i className="icon-file-pdf"></i> Export to .pdf</a></li>
-                      <li><a href="#"><i className="icon-file-excel"></i> Export to .csv</a></li>
-                      <li><a href="#"><i className="icon-file-word"></i> Export to .doc</a></li>
-                    </ul>
-                  </li>
-                </ul>
-              </td>
-            </tr>
+            {
+              this.props.students.map(function(student, i)
+                {
+                  return(
+                    <tr key={i}>
+                      <td>{student.firstName}</td>
+                      <td>{student.lastName}</td>
+                      <td>{student.class}</td>
+                      <td>{}</td>
+                      <td><span className="label label-success">Active</span></td>
+                      <td className="text-center">
+                        <ul className="icons-list">
+                          <li className="dropdown">
+                            <a href="#" className="dropdown-toggle" data-toggle="dropdown">
+                              <i className="icon-menu9"></i>
+                            </a>
+                            <ul className="dropdown-menu dropdown-menu-right">
+                              <li><a href="#"><i className="icon-file-pdf"></i> Export to .pdf</a></li>
+                              <li><a href="#"><i className="icon-file-excel"></i> Export to .csv</a></li>
+                              <li><a href="#"><i className="icon-file-word"></i> Export to .doc</a></li>
+                            </ul>
+                          </li>
+                        </ul>
+                      </td>
+                  </tr>
+                )
+              })
+            }
           </tbody>
         </Table>
       </div>
diff --git a/imports/client/views/org/admin/students/StudentView.js b/imports/client/views/org/admin/students/StudentView.js
index 2f442e5..495dedd 100644
--- a/imports/client/views/org/admin/students/StudentView.js
+++ b/imports/client/views/org/admin/students/StudentView.js
@@ -18,7 +18,9 @@ export class StudentView extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      show: false
+      show: false,
+      firstNameSearch: "",
+      lastNameSearch: "",
     };
     this.showModal = this.showModal.bind(this);
     this.hideModal = this.hideModal.bind(this);
@@ -37,6 +39,12 @@ export class StudentView extends Component {
   };
 
   render() {
+    firstNameSearch = this.state.firstNameSearch;
+    var students =_.filter(this.props.data.students,function(item){
+      console.log(item);
+      return _.includes(item.firstName.toLowerCase(),firstNameSearch.toLowerCase());
+    });
+    console.log(students);
     return (
       <div className="content has-detached-left">
 					<div className="container-detached">
@@ -44,6 +52,7 @@ export class StudentView extends Component {
             <Header/>
             <StudentTable
             data = {this.props.data}
+            students = {students}
             />
           <AddStudent/>
           <UploadCsv />
@@ -64,7 +73,11 @@ export class StudentView extends Component {
 							<div className="category-content">
 								<form action="#">
 									<div className="has-feedback has-feedback-left">
-										<input type="search" className="form-control" placeholder="First Name" />
+										<input type="search" className="form-control"
+                    value={this.state.firstNameSearch}
+                    onChange={e=>this.onUpdate('firstNameSearch',e.target.value)}
+                    placeholder="First Name"
+                    />
 										<div className="form-control-feedback">
 											<i className="icon-search4 text-size-base text-muted"></i>
 										</div>
@@ -74,7 +87,10 @@ export class StudentView extends Component {
 							<div className="category-content">
 								<form action="#">
 									<div className="has-feedback has-feedback-left">
-										<input type="search" className="form-control" placeholder="Last Name" />
+										<input type="search" className="form-control"
+                    value={this.state.lastNameSearch}
+                    onChange={e=>this.onUpdate('lastNameSearch',e.target.value)}
+                    placeholder="Last Name" />
 										<div className="form-control-feedback">
 											<i className="icon-search4 text-size-base text-muted"></i>
 										</div>
diff --git a/imports/client/views/org/admin/students/index.js b/imports/client/views/org/admin/students/index.js
index 3b21c28..d5fde9f 100644
--- a/imports/client/views/org/admin/students/index.js
+++ b/imports/client/views/org/admin/students/index.js
@@ -25,7 +25,6 @@ const meteorTick = (props, onData) => {
     const user = Users.current();
     const org = Orgs.current();
     const students = Users.find({"role":"STUDENT"}).fetch();
-    console.log(students);
     onData(null, {
       data: {
         user: user,