diff --git a/Apollo/assets/views/status.html b/Apollo/assets/views/status.html
index c317751c..b66cdc63 100644
--- a/Apollo/assets/views/status.html
+++ b/Apollo/assets/views/status.html
@@ -22,103 +22,107 @@
 <div class="container-fluid container-fullw bg-white">
     <div ng-controller="statusCtrl">
         <form name="Form" id="form" novalidate ng-submit="statusForm.submit(Form, myModel, 'zoom-in')" method="post">
-                        <div class="row">
-                            <!--<div class="col-md-6">
-                                <div class="padding-30">
-                                    <h2 class="StepTitle"><i
-                                            class="ti-face-smile fa-2x text-primary block margin-bottom-10"></i>
-                                        Enter Bus Stop Details</h2>
-                                </div>
-                            </div>-->
-                            <div class="col-md-12">                                 
-                                    
-                                    <div class="row">
-                                        <div class="col-md-4 form-group" style="display:none">
-                                            <label>
-                                               Status ID <span class="symbol required"></span>
-                                            </label>
-
-                                            <input type="text"  placeholder="Enter Status ID"
-                                                   tabindex="1" class="form-control" name="StatusID"
-                                                   ng-model="myModel.StatusID"/>
-                                            <!--<span class="error text-small block"
-                                                  ng-if="Form.StatusID.$dirty && Form.StatusID.$error.required">Status ID is required</span>
-                                            <span class="error text-small block"
-                                                  ng-if="Form.StatusID.$dirty && Form.StatusID.$error.pattern">Invalid  Status ID </span>-->
-                                            
-                                        </div>
-
-
-                                        <div class="col-md-4 form-group"
-                                             ng-class="{'has-error':Form.StatusName.$dirty && Form.StatusName.$invalid, 'has-success':Form.StatusName.$valid}">
-                                            <label>
-                                                Status Name <span class="symbol required"></span>
-                                            </label>
-
-                                            <input type="text"  placeholder="Enter Status Name"
-                                                   tabindex="2" class="form-control" name="StatusName"
-                                                   ng-model="myModel.StatusName" ng-pattern="/^[a-zA-Z0-9.\s]*$/" required/>
-                                            <span class="error text-small block"
-                                                  ng-if="Form.StatusName.$dirty && Form.StatusName.$error.required">Status name is required</span>
-                                            <span class="error text-small block"
-                                                  ng-if="Form.StatusName.$dirty && Form.StatusName.$error.pattern">Invalid Status name </span>
-                                            <!--<span class="success text-small"-->
-                                            <!--ng-if="Form.stopname.$valid">Thank You!</span>-->
-                                        </div>
-                                        <div class="col-md-4">
-                                            <label>
-                                                Active/De-Active
-                                            </label>
-                                            <div ng-switch="myModel.switchsetting">
-                                                <div ng-switch-when="true">
-                                                    <switch ng-model="myModel.switchsetting" ng-init="myModel.switchsetting = true" class="green"></switch>
-
-                                                </div>
-                                                <div ng-switch-when="false">
-                                                    <switch ng-model="myModel.switchsetting" ng-init="myModel.switchsetting = false" class="green"></switch>
-
-                                                </div>
-
-
-                                                <div ng-switch-default>
-                                                    <switch ng-model="myModel.switchsetting" ng-init="myModel.switchsetting = true" class="green"></switch>
-
-                                                </div>
-                                            </div>
-
-                                        </div>
-
-                                        
-                                    </div>
-                                 
-                                   
-
-
-
-                                    <div class="col-md-12">
-                                        <div class="pull-right">
-                                            <button type="submit" ladda="ldloading1.zoom_in" tabindex="9" class="btn btn-wide btn-success" data-style="zoom-in">
-                                                Submit
-                                            </button>
-                                           <!-- <button type="submit" class="btn btn-success btn-o" tabindex="8">
-                                                Submit
-                                            </button>-->
-                                            <button type="reset" class="btn btn-warning btn-wide" tabindex="10"
-                                                    ng-click="statusForm.reset(Form)">
-                                                Reset
-                                            </button>
-                                        </div>
-                                    </div>
-                                
-                            </div>
+            <fieldset>
+                <legend>Add Status Details</legend>
+                <div class="row">
+                    <!--<div class="col-md-6">
+                        <div class="padding-30">
+                            <h2 class="StepTitle"><i
+                                    class="ti-face-smile fa-2x text-primary block margin-bottom-10"></i>
+                                Enter Bus Stop Details</h2>
                         </div>
+                    </div>-->
+                    <div class="col-md-12">
+
+                        <div class="row">
+
+                            <div class="col-md-4 form-group"
+                                 ng-class="{'has-error':Form.StatusName.$dirty && Form.StatusName.$invalid, 'has-success':Form.StatusName.$valid}">
+                                <label>
+                                    Status Name <span class="symbol required"></span>
+                                </label>
+
+                                <input type="text"  placeholder="Enter Status Name"
+                                       tabindex="1" class="form-control" name="StatusName"
+                                       ng-model="myModel.StatusName" ng-pattern="/^[a-zA-Z0-9.\s]*$/" required/>
+                                <span class="error text-small block"
+                                      ng-if="Form.StatusName.$dirty && Form.StatusName.$error.required">Status name is required</span>
+                                <span class="error text-small block"
+                                      ng-if="Form.StatusName.$dirty && Form.StatusName.$error.pattern">Invalid Status name </span>
+                                <!--<span class="success text-small"-->
+                                <!--ng-if="Form.stopname.$valid">Thank You!</span>-->
+                            </div>
+                            <!--<div class="col-md-4">
+                                <label>
+                                    Active/De-Active
+                                </label>
+                                <div ng-switch="myModel.switchsetting">
+                                    <div ng-switch-when="true">
+                                        <switch ng-model="myModel.switchsetting" ng-init="myModel.switchsetting = true" class="green"></switch>
+
+                                    </div>
+                                    <div ng-switch-when="false">
+                                        <switch ng-model="myModel.switchsetting" ng-init="myModel.switchsetting = false" class="green"></switch>
+
+                                    </div>
+
+
+                                    <div ng-switch-default>
+                                        <switch ng-model="myModel.switchsetting" ng-init="myModel.switchsetting = true" class="green"></switch>
+
+                                    </div>
+                                </div>
+
+                            </div>-->
+                            <div class="col-md-2" style="padding-top: 2.3%;">
+                                <div class="pull-right">
+                                    <button type="submit" ladda="ldloading1.zoom_in" tabindex="2" class="btn btn-wide btn-success" data-style="zoom-in">
+                                        Submit
+                                    </button>
+                                    <!-- <button type="submit" class="btn btn-success btn-o" tabindex="8">
+                                         Submit
+                                     </button>-->
+                                    <!--<button type="reset" class="btn btn-warning btn-wide" tabindex="3"
+                                            ng-click="statusForm.reset(Form)">
+                                        Reset
+                                    </button>-->
+                                </div>
+                            </div>
+
+                        </div>
+
+
+                    </div>
+                </div>
+            </fieldset>
+
                     </form>
+        <div class="row">
+
+            <div class="col-md-3">
+                <script>
+                    $(function () {
+                        $("#search").focus();
+
+                    });
+                </script>
+                <input class="form-control" type="text" ng-model="search"
+                       id="search" autofocus tabindex="5"
+                       placeholder="Search"/><br><br>
+            </div>
+
+
+        </div>
         <table class="table table-hover" ng-init="init();">
             <thead>
                 <tr>
-                    <th>Status ID
+                    <th ng-click="sort('ListCode')">Status ID
+                        <span class="glyphicon sort-icon" ng-show="sortKey=='ListCode'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"> </span>
+
                     </th>
-                    <th>Status Name
+                    <th ng-click="sort('ListName')">Status Name
+                        <span class="glyphicon sort-icon" ng-show="sortKey=='ListName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"> </span>
+
                     </th>
                     <th></th>
                 </tr>