=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html	2015-08-04 07:44:44 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html	2015-08-06 15:06:48 +0000
@@ -1,28 +1,28 @@
 <form name="outerForm" novalidate>   
     
-    <table class="table-borderless table-striped" ng-if='currentEvent && !currentStage.programStageSections.length'>
+    <table class="dhis2-list-table-striped" ng-if='currentEvent && !currentStage.programStageSections.length'>
         <thead>
-            <tr class="col-md-12">
-                <th class="col-md-5">
+            <tr>
+                <th>
                     {{'data_element'| translate}}
                 </th>
-                <th class="col-md-5 align-center">
+                <th>
                     {{'value'| translate}}
                 </th>
-                <th class="col-md-2 align-center" ng-if="allowProvidedElsewhereExists">
+                <th ng-if="allowProvidedElsewhereExists">
                     {{'provided_elsewhere'| translate}}
                 </th>
             </tr>
         </thead>
         <tr class="col-md-12" ng-repeat="prStDe in currentStage.programStageDataElements" ng-if="!isHidden(prStDe.dataElement.id)">
-            <td class="col-md-5">
+            <td>
                 {{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.name}}
                 <a ng-if="prStDe.dataElement.description" Title="{{prStDe.dataElement.description}}" ng-init="showHelpText[prStDe.dataElement.id] = false;" ng-click="showHelpText[prStDe.dataElement.id] = !showHelpText[prStDe.dataElement.id]">
                     <span class="glyphicon glyphicon-info-sign" ></span>
                     <span ng-show="showHelpText[prStDe.dataElement.id]" ><br>{{prStDe.dataElement.description}}</span>
                 </a>     
             </td>
-            <td class="col-md-5">
+            <td>
                 <ng-form name="innerForm">
                     <div ng-if="prStDe.dataElement.optionSetValue">
                         <div ng-if="!selectedProgram.dataEntryMethod || optionSets[prStDe.dataElement.optionSet.id].options.length >= 7">
@@ -156,7 +156,7 @@
                     </div>
                 </ng-form>                
             </td>
-            <td class="col-md-2" ng-if="allowProvidedElsewhereExists">                
+            <td ng-if="allowProvidedElsewhereExists">                
                 <div class="align-center" ng-show="prStDe.allowProvidedElsewhere">
                     <input type="checkbox" 
                            ng-model="currentEvent.providedElsewhere[prStDe.dataElement.id]" 
@@ -173,28 +173,28 @@
             <accordion-group heading="{{section.name}}" is-open="section.open" ng-repeat='section in currentStage.programStageSections' style="overflow:visible">
                 <table class="dhis2-list-table-striped">                    
                     <thead>                        
-                        <tr class="col-md-12">
-                            <th class="col-md-5">
+                        <tr>
+                            <th>
                                 {{'data_element'| translate}}
                             </th>
-                            <th class="col-md-5 align-center">
+                            <th>
                                 {{'value'| translate}}
                             </th>
-                            <th class="col-md-2 align-center" ng-if="allowProvidedElsewhereExists">
+                            <th ng-if="allowProvidedElsewhereExists">
                                 {{'provided_elsewhere'| translate}}
                             </th>
                         </tr>                        
                     </thead>
                     <tbody id="list">       
-                        <tr class="col-md-12" ng-repeat="de in section.programStageDataElements" ng-if="!isHidden(de.dataElement.id)">
-                            <td class="col-md-5">
+                        <tr ng-repeat="de in section.programStageDataElements" ng-if="!isHidden(de.dataElement.id)">
+                            <td>
                                 {{prStDes[de.dataElement.id].dataElement.formName ? prStDes[de.dataElement.id].dataElement.formName : prStDes[de.dataElement.id].dataElement.name}}
                                 <a ng-if="prStDes[de.dataElement.id].dataElement.description" Title="{{prStDes[de.dataElement.id].dataElement.description}}" ng-init="showHelpText[de.dataElement.id] = false;" ng-click="showHelpText[de.dataElement.id] = !showHelpText[de.dataElement.id]">
                                     <span class="glyphicon glyphicon-info-sign" ></span>
                                     <span ng-show="showHelpText[de.dataElement.id]" ><br>{{prStDes[de.dataElement.id].dataElement.description}}</span>
                                 </a>                            
                             </td>
-                            <td class="col-md-5">
+                            <td>
                                 <ng-form name="innerForm">
                                     <div ng-if="prStDes[de.dataElement.id].dataElement.optionSetValue">                                        
                                         <div ng-if="!selectedProgram.dataEntryMethod || optionSets[prStDes[de.dataElement.id].dataElement.optionSet.id].options.length >= 7">
@@ -328,7 +328,7 @@
                                     </div>
                                 </ng-form>                                
                             </td>
-                            <td class="col-md-2" ng-if="allowProvidedElsewhereExists">                
+                            <td ng-if="allowProvidedElsewhereExists">                
                                 <div class="align-center" ng-show="prStDes[de.dataElement.id].allowProvidedElsewhere">
                                     <input type="checkbox" 
                                            ng-model="currentEvent.providedElsewhere[prStDes[de.dataElement.id].dataElement.id]"

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/notes/notes-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/notes/notes-controller.js	2015-03-27 12:43:44 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/notes/notes-controller.js	2015-08-06 15:06:48 +0000
@@ -47,9 +47,7 @@
             }
         }
     });
-   
-    $scope.searchNoteField = false;
-    
+       
     $scope.addNote = function(){
         
         if(!angular.isUndefined($scope.note) && $scope.note !== ""){
@@ -78,11 +76,6 @@
          $scope.note = '';           
     };
     
-    $scope.searchNote = function(){        
-        $scope.searchNoteField = $scope.searchNoteField === false ? true : false;
-        $scope.noteSearchText = '';
-    };
-    
     $scope.showNotes = function(){
         $scope.showNotesDiv = !$scope.showNotesDiv;
         $scope.showMessagingDiv = !$scope.showMessagingDiv;

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css	2015-06-15 15:29:59 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css	2015-08-06 15:06:48 +0000
@@ -547,6 +547,7 @@
 .add-default-padding {
     margin: 15px !important;
 }
+
 .add-default-top-margin {
     margin-top: 15px !important;    
 }
@@ -583,12 +584,6 @@
     font-size: 14px;
 }
 
-/*input[type=number], input[type=text], input[type=email], input[type=password], textarea, select {
-    border: 1px solid #aaa;
-    padding: 2px 6px;
-    font-size: 14px;
-}*/
-
 /*----------------------------------------------------------------------------*/
 /* Search filters
 /*----------------------------------------------------------------------------*/
@@ -690,8 +685,7 @@
     font-size: 14px;
     line-height: 1.0;
     color: #555;
-    //padding: 6px 6px;
-    padding: 6px 0;
+    padding: 6px 6px;
     margin-bottom: 5px;
     margin-top: 5px;
     vertical-align: middle;

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/select2/select2.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/select2/select2.css	2014-05-14 13:04:39 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/select2/select2.css	2015-08-06 15:06:48 +0000
@@ -76,9 +76,8 @@
     margin-right: 26px;
     display: block;
     overflow: hidden;
-
+	padding-left: 6px;
     white-space: nowrap;
-
     text-overflow: ellipsis;
     float: none;
     width: auto;