diff --git a/imports/client/views/org/admin/students/add/StudentForm.js b/imports/client/views/org/admin/students/add/StudentForm.js
index 2db920a..a321be7 100644
--- a/imports/client/views/org/admin/students/add/StudentForm.js
+++ b/imports/client/views/org/admin/students/add/StudentForm.js
@@ -37,7 +37,7 @@ const StudentForm = props => (
       <fieldset title="1">
         <legend className="text-semibold">Personal data</legend>
         <Row>
-          <Col xs={12} sm={6}>
+          <Col xs={12} sm={4}>
             <FormGroup controlId="admissionId">
               <Label required>Admission Id</Label>
               <FormControl
@@ -51,7 +51,7 @@ const StudentForm = props => (
               )}
             </FormGroup>
           </Col>
-          <Col xs={12} sm={6}>
+          <Col xs={12} sm={4}>
             <FormGroup controlId="firstName">
               <Label required>First Name</Label>
               <FormControl
@@ -65,41 +65,39 @@ const StudentForm = props => (
               )}
             </FormGroup>
           </Col>
+          <Col xs={12} sm={4}>
+            <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>
         </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}>
+          <Col xs={12} sm={4}>
+            <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>
+          <Col xs={12} sm={4}>
             <FormGroup controlId="email">
               <Label required>Email</Label>
               <FormControl
@@ -113,7 +111,7 @@ const StudentForm = props => (
               )}
             </FormGroup>
           </Col>
-          <Col xs={12} sm={6}>
+          <Col xs={12} sm={4}>
             <FormGroup>
               <Label required>Date of birth</Label>
               <DatePicker
@@ -130,16 +128,13 @@ const StudentForm = props => (
             </FormGroup>
           </Col>
         </Row>
-        <Row>
-
-        </Row>
       </fieldset>
     )}
     {props.currentStep === 1 && (
       <fieldset title="Academic">
         <legend className="text-semibold">Academic</legend>
         <Row>
-          <Col xs={12} sm={6}>
+          <Col xs={12} sm={4}>
             <FormGroup controlId="rollNo">
               <Label required>Roll No</Label>
               <FormControl
@@ -153,7 +148,7 @@ const StudentForm = props => (
               )}
             </FormGroup>
           </Col>
-          <Col xs={12} sm={6}>
+          <Col xs={12} sm={4}>
             <FormGroup controlId="class">
               <Label required>Class</Label>
               <FormControl
@@ -167,9 +162,7 @@ const StudentForm = props => (
               )}
             </FormGroup>
           </Col>
-        </Row>
-        <Row>
-          <Col xs={12} sm={6}>
+          <Col xs={12} sm={4}>
             <FormGroup controlId="section">
               <Label required>Section</Label>
               <FormControl
@@ -183,7 +176,9 @@ const StudentForm = props => (
               )}
             </FormGroup>
           </Col>
-          <Col xs={12} sm={6}>
+        </Row>
+        <Row>
+          <Col xs={12} sm={4}>
             <FormGroup controlId="community">
               <Label required>Community</Label>
               <FormControl
@@ -197,9 +192,7 @@ const StudentForm = props => (
               )}
             </FormGroup>
           </Col>
-        </Row>
-        <Row>
-          <Col xs={12} sm={6}>
+          <Col xs={12} sm={4}>
             <FormGroup controlId="bloodGroup">
               <Label required>bloodGroup</Label>
               <FormControl
@@ -213,7 +206,7 @@ const StudentForm = props => (
               )}
             </FormGroup>
           </Col>
-          <Col xs={12} sm={6}>
+          <Col xs={12} sm={4}>
             <FormGroup controlId="phone">
               <Label required>Phone</Label>
               <FormControl
@@ -234,7 +227,7 @@ const StudentForm = props => (
       <fieldset title="Address">
         <legend className="text-semibold">Address</legend>
         <Row>
-          <Col xs={12} sm={6}>
+          <Col xs={12} sm={4}>
             <FormGroup controlId="address">
               <Label required>Address</Label>
               <FormControl
@@ -248,7 +241,7 @@ const StudentForm = props => (
               )}
             </FormGroup>
           </Col>
-          <Col xs={12} sm={6}>
+          <Col xs={12} sm={4}>
             <FormGroup controlId="city">
               <Label required>City</Label>
               <FormControl
@@ -262,9 +255,7 @@ const StudentForm = props => (
               )}
             </FormGroup>
           </Col>
-        </Row>
-        <Row>
-          <Col xs={12} sm={6}>
+          <Col xs={12} sm={4}>
             <FormGroup controlId="state">
               <Label required>State</Label>
               <FormControl
@@ -285,7 +276,7 @@ const StudentForm = props => (
       <fieldset title="2">
         <legend className="text-semibold">Parent information</legend>
         <Row>
-          <Col xs={12} sm={6}>
+          <Col xs={12} sm={4}>
             <FormGroup controlId="parentName">
               <Label required>Parent Name</Label>
               <FormControl
@@ -299,7 +290,7 @@ const StudentForm = props => (
               )}
             </FormGroup>
           </Col>
-          <Col xs={12} sm={6}>
+          <Col xs={12} sm={4}>
             <FormGroup controlId="parentEmail">
               <Label required>Parent Email</Label>
               <FormControl
@@ -313,9 +304,7 @@ const StudentForm = props => (
               )}
             </FormGroup>
           </Col>
-        </Row>
-        <Row>
-          <Col xs={12} sm={6}>
+          <Col xs={12} sm={4}>
             <FormGroup controlId="relation">
               <Label required>Relation</Label>
               <FormControl
@@ -329,7 +318,9 @@ const StudentForm = props => (
               )}
             </FormGroup>
           </Col>
-          <Col xs={12} sm={6}>
+        </Row>
+        <Row>
+          <Col xs={12} sm={4}>
             <FormGroup controlId="profession">
               <Label required>Profession</Label>
               <FormControl
@@ -343,9 +334,7 @@ const StudentForm = props => (
               )}
             </FormGroup>
           </Col>
-        </Row>
-        <Row>
-          <Col xs={12} sm={6}>
+          <Col xs={12} sm={4}>
             <FormGroup controlId="parentGender">
               <Label>Parent Gender</Label>
               <FormControl componentClass="select"
@@ -361,7 +350,7 @@ const StudentForm = props => (
               )}
             </FormGroup>
           </Col>
-          <Col xs={12} sm={6}>
+          <Col xs={12} sm={4}>
             <FormGroup controlId="parentPhone">
               <Label required>Parent Phone</Label>
               <FormControl
@@ -377,7 +366,7 @@ const StudentForm = props => (
           </Col>
         </Row>
         <Row>
-          <Col xs={12} sm={6}>
+          <Col xs={12} sm={4}>
             <FormGroup controlId="parentAddress">
               <Label required>Parent Address</Label>
               <FormControl
@@ -391,7 +380,7 @@ const StudentForm = props => (
               )}
             </FormGroup>
           </Col>
-          <Col xs={12} sm={6}>
+          <Col xs={12} sm={4}>
             <FormGroup controlId="parentCity">
               <Label required>Parent City</Label>
               <FormControl
@@ -405,23 +394,23 @@ const StudentForm = props => (
               )}
             </FormGroup>
           </Col>
+          <Col xs={12} sm={4}>
+            <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>
         </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}>
+          <Col xs={12} sm={4}>
             <FormGroup controlId="parentZipcode">
               <Label required>Parent Zipcode</Label>
               <FormControl
diff --git a/imports/client/views/org/admin/students/add/addStudent.js b/imports/client/views/org/admin/students/add/addStudent.js
index dc67039..c08e592 100644
--- a/imports/client/views/org/admin/students/add/addStudent.js
+++ b/imports/client/views/org/admin/students/add/addStudent.js
@@ -43,6 +43,7 @@ export class AddStudent extends Component {
           show={this.state.show}
           onHide={this.hideModal}
           dialogClassName="custom-modal"
+          bsSize="large"
         >
           <Modal.Header closeButton>
             <Modal.Title id="contained-modal-title-lg">Add Student</Modal.Title>