=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-notes.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-notes.html	2016-03-08 15:39:09 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-notes.html	2016-03-15 12:36:34 +0000
@@ -17,20 +17,16 @@
 </div>
 <table class="table table-striped dhis2-table-hover">
     <tr ng-repeat="note in currentEvent.notes">
-        <td class="add-default-left-padding">
-            <d2-pop-over content="note" template="popover.html" details="{{'details'| translate}}">
-                <div class="horizonal-spacing">
-                    <span>{{note.heading}}</span>
-                    <span class="pull-right">{{note.displayDate}}</span>
-                </div>
-            </d2-pop-over>
-            <script type="text/ng-template" id="popover.html">
-                <div class="wrap-text">{{content.value}}</div>
-                <hr>
-                <p><strong>{{'created_by' | translate}}: </strong>{{content.storedBy}}</p>
-                <p><strong>{{'date' | translate}}: </strong>{{content.storedDate}}</p>                           
-            </script>
-        </td> 
+        <td d2-pop-over content="note" template="popover.html" details="{{'details'| translate}}">                
+            <span>{{note.heading}}</span>
+            <span class="pull-right">{{note.displayDate}}</span>            
+        </td>
+        <script type="text/ng-template" id="popover.html">
+            <div class="wrap-text">{{content.value}}</div>
+            <hr>
+            <p><strong>{{'created_by' | translate}}: </strong>{{content.storedBy}}</p>
+            <p><strong>{{'date' | translate}}: </strong>{{content.storedDate}}</p>                           
+        </script>
     </tr>
 </table>
 </div>

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html	2016-02-15 09:46:27 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html	2016-03-15 12:36:34 +0000
@@ -37,7 +37,7 @@
                     </div>
                     <div class="vertical-spacing">
                         <div ng-if="selectedEnrollment.enrollment">                    
-                            <table class="dhis2-list-table-striped dhis2-table-hover">
+                            <table class="dhis2-list-table-striped default-form-table">
                                 <tr>
                                     <td>
                                         {{'enrolling_orgunit' | translate}}

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html	2016-03-08 15:39:09 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html	2016-03-15 12:36:34 +0000
@@ -46,21 +46,16 @@
                     </div>
                     <table class="table table-striped dhis2-table-hover">
                         <tr ng-repeat="note in selectedEnrollment.notes| filter:noteSearchText">
-                            <td class="add-default-left-padding">
-                                <d2-pop-over content="note" template="popover.html" details="{{'details'| translate}}">
-                                    <div class="horizonal-spacing">
-                                        <span>{{note.heading}}</span>
-                                        <span class="pull-right">{{note.displayDate}}</span>                                
-                                    </div>
-
-                                </d2-pop-over>
-                                <script type="text/ng-template" id="popover.html">
-                                    <div class="wrap-text">{{content.value}}</div>
-                                    <hr>
-                                    <p><strong>{{'created_by' | translate}}: </strong>{{content.storedBy}}</p>
-                                    <p><strong>{{'date' | translate}}: </strong>{{content.storedDate}}</p>                           
-                                </script>
-                            </td> 
+                            <td d2-pop-over content="note" template="popover.html" details="{{'details'| translate}}">
+                                <span>{{note.heading}}</span>
+                                <span class="pull-right">{{note.displayDate}}</span>                                
+                            </td>
+                            <script type="text/ng-template" id="popover.html">
+                                <div class="wrap-text">{{content.value}}</div>
+                                <hr>
+                                <p><strong>{{'created_by' | translate}}: </strong>{{content.storedBy}}</p>
+                                <p><strong>{{'date' | translate}}: </strong>{{content.storedDate}}</p>                           
+                            </script>
                         </tr>
                     </table>
                 </div>

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/default-registration-form.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/default-registration-form.html	2016-03-10 09:15:35 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/default-registration-form.html	2016-03-15 12:36:34 +0000
@@ -18,7 +18,7 @@
         </tr>-->
     </table>
 </script>
-<table class="dhis2-list-table-striped dhis2-table-hover">
+<table class="dhis2-list-table-striped default-form-table">
     <tr ng-repeat="attribute in attributes | filter: {attribute: 'true'} " ng-if="!hiddenFields[attribute.id] && ((editingDisabled  && attribute.show) || !editingDisabled)">
         <td>
             <span d2-pop-over