=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js	2015-09-24 14:38:58 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js	2015-10-01 13:52:52 +0000
@@ -211,6 +211,8 @@
         $scope.emptySearchAttribute = false;
         $scope.showRegistrationDiv = false;  
         $scope.showTrackedEntityDiv = false;        
+        $scope.teiFetched = false;
+        $scope.trackedEntityList = null;
         
         $scope.queryUrl = null;
         $scope.programUrl = null;
@@ -263,6 +265,7 @@
         
         $scope.teiFetched = false;
         $scope.trackedEntityList = null;
+        $scope.showTrackedEntityDiv = true;
         
         //get events for the specified parameters        
         TEIService.search($scope.searchingOrgUnit.id, 
@@ -284,8 +287,7 @@
             
             //process tei grid
             $scope.trackedEntityList = TEIGridService.format(data,false, $scope.optionSets, null);
-
-            $scope.showTrackedEntityDiv = true;
+            
             $scope.showSearchDiv = false;
             $scope.teiFetched = true;  
             $scope.doSearch = true;

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html	2015-10-01 13:43:16 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html	2015-10-01 13:52:52 +0000
@@ -143,19 +143,19 @@
         <!--- search and registration menu ends -->
 
         <!--- Error display for search begins -->
-        <div class="row col-sm-12 vertical-spacing" ng-if="emptySearchAttribute || !searchText && emptySearchText">
+        <div class="vertical-spacing" ng-if="emptySearchAttribute || !searchText && emptySearchText">
             <div class="alert alert-warning">{{'search_input_required'| translate}}</div>
         </div>
         <!--- Error display for search ends -->
 
         <!--registration form begins -->
-        <div class="row col-sm-12" ng-if="showRegistrationDiv">
-            <div ng-include="'components/registration/registration.html'"></div>
+        <div class="row" ng-if="showRegistrationDiv">
+            <div class="col-sm-12" ng-include="'components/registration/registration.html'"></div>
         </div>
         <!-- registration form ends -->        
 
         <!-- entity grid begins -->
-        <i ng-if="!teiFetched" class="fa fa-spinner fa-spin fa-2x"></i>
+        <i ng-if="!teiFetched && showTrackedEntityDiv" class="fa fa-spinner fa-spin fa-2x"></i>
         <div class="row">
              <div class="col-sm-12" ng-if="!showRegistrationDiv" ng-include="'views/tei.html'"></div>
         </div>