diff --git a/Apollo/assets/views/activity.html b/Apollo/assets/views/activity.html
index 15e49c0d..1676a71b 100755
--- a/Apollo/assets/views/activity.html
+++ b/Apollo/assets/views/activity.html
@@ -21,87 +21,136 @@
 </section>
 <div class="container-fluid container-fullw bg-white">
     <div ng-controller="activityCtrl">
-        <form class="form-horizontal" role="form" id="form" name="Form" ng-submit="activityForm.submit(Form, companies, 'zoom-in')" method="post" novalidate>
-             
-            <!-- Start :Auto Generate Activity ID -->
-            <div class="form-group" style="display:none">
-                <label class="col-md-2 control-label">Activity ID <span class="symbol required"></label>
-                <div class="col-md-3">
-                    <input type="text" class="form-control" name="ActivityID" placeholder="Enter Activity ID" ng-model="companies.ActivityID"
-                    />
+        <form id="form" name="Form" ng-submit="activityForm.submit(Form, companies, 'zoom-in')" method="post" novalidate>
+            <fieldset>
+                <legend>Add Activity Details</legend>
+                <div class="col-md-3 form-group"
+                     ng-class="{'has-error':Form.ActivityName.$dirty && Form.ActivityName.$invalid, 'has-success':Form.ActivityName.$valid}">
+                    <label>
+                        Activity Name <span class="symbol required"></span>
+                    </label>
+
+                    <input type="text" class="form-control" tabindex="1" name="ActivityName" placeholder="Enter Activity Name" ng-model="companies.ActivityName" required/>
+                    <span class="error text-small block"
+                          ng-if="Form.ActivityName.$dirty && Form.ActivityName.$error.required">Activity name is required</span>
+                    <span class="error text-small block"
+                          ng-if="Form.ActivityName.$dirty && Form.ActivityName.$error.pattern">Invalid activity name </span>
                 </div>
-            </div>
-            <!-- End :Auto Generate Activity ID -->
-            <div class="form-group" ng-class="{'has-error':Form.ActivityName.$dirty && Form.ActivityName.$invalid, 'has-success':Form.ActivityName.$valid}">
-                <label class="col-md-2 control-label">Activity Name<span class="symbol required"></label>
-                <div class="col-md-3">
-                    <input type="text" class="form-control" name="ActivityName" placeholder="Enter Activity Name" ng-model="companies.ActivityName" required/>
-                     <span class="error text-small block"
-                                 ng-if="Form.ActivityName.$dirty && Form.ActivityName.$error.required">Activity Name is required</span>
-                            <span class="error text-small block"
-                                 ng-if="Form.ActivityName.$dirty && Form.ActivityName.$error.pattern">Invalid Activity Name </span>
-                </div>
-            </div>
-            <div class="form-group" ng-class="{'has-error':Form.Description.$dirty && Form.Description.$invalid, 'has-success':Form.Description.$valid}">
-                <label class="col-md-2 control-label">Description<span class="symbol required"></label>
-                <div class="col-md-3">
-                    <input type="text" class="form-control" name="Description" placeholder="Enter Description" ng-model="companies.Description" required
+
+
+
+                <div class="col-md-3 form-group" ng-class="{'has-error':Form.Description.$dirty && Form.Description.$invalid, 'has-success':Form.Description.$valid}">
+                    <label>Description<span class="symbol required"></span></label>
+
+                    <input type="text" class="form-control" tabindex="2" name="Description" placeholder="Enter Description" ng-model="companies.Description" required
                     />
                     <span class="error text-small block"
-                                 ng-if="Form.Description.$dirty && Form.Description.$error.required">Activity Name is required</span>
-                            <span class="error text-small block"
-                                 ng-if="Form.Description.$dirty && Form.Description.$error.pattern">Invalid Activity Name </span>
+                          ng-if="Form.Description.$dirty && Form.Description.$error.required">Description is required</span>
+                    <span class="error text-small block"
+                          ng-if="Form.Description.$dirty && Form.Description.$error.pattern">Invalid description </span>
                 </div>
-            </div>
 
-            <div class="col-md-4 col-md-offset-4">
-                <div class="form-group">
+                <div class="col-md-4">
+                    <div class="form-group"
+                         ng-class="{'has-error':Form.status.$dirty && Form.status.$invalid, 'has-success':Form.status.$valid}">
+                        <label >
+                            Status<span
+                                class="symbol required"></span>
+                        </label>
+
+                        <ui-select multiple ng-model="companies.status" tabindex="3">
+                            <ui-select-match placeholder="Select Status">
+                                {{$item.name}}
+                            </ui-select-match>
+                            <ui-select-choices
+                                    repeat="d in statusList | filter:$select.search">
+                                {{d.name}}
+                            </ui-select-choices>
+                        </ui-select>
+
+                        <input type="hidden" name="status"
+                               ng-model="companies.status"
+                               required>
+                        <span class="error text-small block"
+                              ng-if="Form.status.$dirty && Form.status.$error.required && myModel.status.length==0">Status is required.</span>
+                        <!--<span class="success text-small block"-->
+                        <!--ng-if="Form.subjects.$valid && myModel.subjects.length!=0">Thank You</span>-->
+                    </div>
+                </div>
+
+
+
+                <!--<div class="col-md-4 pull-right">
 
                     <input type="submit" value="Submit" ladda="ldloading1.zoom_in" tabindex="9" class="btn btn-wide btn-success" data-style="zoom-in"/>
 
+            </div>-->
+                <div class="col-md-2" style="padding-top: 2.3%;">
+                    <div class="pull-right">
+                        <!--<button type="submit" ladda="ldloading1.zoom_in" tabindex="4" class="btn btn-wide btn-success" data-style="zoom-in"/>
+                        Submit
+                    </button>-->
+                        <button type="submit" ladda="ldloading.zoom_in" tabindex="4" class="btn btn-wide btn-success" data-style="zoom-in">
+                            Submit
+                        </button>
+                    </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>Activity ID
+                    <th ng-click="sort('ActivityID')">Activity ID
+                        <span class="glyphicon sort-icon" ng-show="sortKey=='ActivityID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"> </span>
                     </th>
-                    <th>Activity Name
+                    <th ng-click="sort('ActivityName')">Activity Name
+                        <span class="glyphicon sort-icon" ng-show="sortKey=='ActivityName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"> </span>
+
                     </th>
                     <th>Description
                     </th>
+                    <th></th>
                    
 
                 </tr>
             </thead>
             <tbody dir-paginate="p in activityInfo|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10">
                 <tr>
-                    <td>{{p.ListCode}}</td>
-                    <td>{{p.ListName}}</td>
+                    <td>{{p.ActivityID}}</td>
+                    <td>{{p.ActivityName}}</td>
                     <td>{{p.Description}}</td>
 
-                    <!--<td ng-if="p.IsActive==true">
-                        <switch ng-model="p.IsActive" ng-change="onclick(p.ListCode, p.IsActive)" ng-init="p.IsActive = true" class="green"></switch>
-
-                    </td>
-                    <td ng-if="p.IsActive==false">
-                        <switch ng-model="p.IsActive" ng-change="onclick(p.ListCode, p.IsActive)" ng-init="p.IsActive = false" class="green"></switch>
-
-                    </td>-->
                     <td> 
-                        <a class="text-azure" id="editRowBtn{{p.ListCode}}" ng-click="setEditId(p.ListCode);"><b class="fa fa-hover fa-pencil " aria-hidden="true"></b>
+                        <a class="text-azure" id="editRowBtn{{p.ActivityID}}" ng-click="setEditId(p);"><b class="fa fa-hover fa-pencil " aria-hidden="true"></b>
                             </a>
 
                         </td>
                 </tr>
-                <tr ng-show="editId === p.ListCode" ng-if="editId === p.ListCode" >
+                <tr ng-show="editId === p.ActivityID" ng-if="editId === p.ActivityID" >
                                             <td colspan="12" ng-include src="'assets/views/editActivityDetails.html'"></td>
                                         </tr>
 
             </tbody>
 
         </table>
+    </div>
         <dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
         </dir-pagination-controls>
     </div>