=== removed directory 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/activeprograms'
=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/activeprograms/active-programs-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/activeprograms/active-programs-controller.js	2015-10-16 13:43:11 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/activeprograms/active-programs-controller.js	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-/* global trackerCapture, angular */
-
-trackerCapture.controller('ActiveProgramsController',
-        function($scope, 
-        $location,
-        $translate,
-        CurrentSelection) {
-    //listen for the selected items
-    $scope.emptyActiveProgramLabel = $translate.instant('no_active_program');
-    
-    $scope.$on('selectedItems', function(event, args) {        
-        var selections = CurrentSelection.get();
-        $scope.selectedTeiId = selections.tei ? selections.tei.trackedEntityInstance : null;
-        $scope.activeEnrollments =  [];
-        $scope.selectedProgram = selections.pr ? selections.pr : null;
-        angular.forEach(selections.enrollments, function(en){
-            if(en.status === "ACTIVE"){
-                $scope.activeEnrollments.push(en);                           
-            }
-        });
-    });
-    
-    $scope.changeProgram = function(program){
-        $location.path('/dashboard').search({tei: $scope.selectedTeiId, program: program});
-    };
-});
\ No newline at end of file

=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/activeprograms/active-programs.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/activeprograms/active-programs.html	2015-10-16 13:43:11 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/activeprograms/active-programs.html	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-<div class="panel panel-info" ng-controller="ActiveProgramsController">
-    <div class="panel-heading handle bold">
-        {{activeProgramsWidget.title| translate}}
-        <span class="pull-right widget-link">
-            <a class="small-horizonal-spacing" href ng-click="expandCollapse(activeProgramsWidget)">
-                <span ng-show="activeProgramsWidget.expand"><i class="fa fa-chevron-up" title="{{collapseLabel}}"></i></span>
-                <span ng-show="!activeProgramsWidget.expand"><i class="fa fa-chevron-down" title="{{expandLabel}}"></i></span>
-            </a>
-            <a class="small-horizonal-spacing" href ng-click="removeWidget(activeProgramsWidget)" title="{{removeLabel}}"><i class="fa fa-times-circle"></i></a>            
-        </span>        
-    </div>    
-    <div ng-show="activeProgramsWidget.expand" class="panel-body dashboard-widget-container">        
-        <div ng-show="activeEnrollments.length === 0" class="alert alert-warning">{{'no_active_programs_exist' | translate}}</div> 
-        <div ng-if="activeEnrollments.length > 0">
-            <table class="table table-striped dhis2-table-hover table-bordered">
-                <tr ng-repeat="activeEnrollment in activeEnrollments">
-                    <td ng-if="selectedProgram && selectedProgram.id !== activeEnrollment.program" title="{{'set_as_current'| translate}}" ng-click="changeProgram(activeEnrollment.program)">
-                        {{programNames[activeEnrollment.program].name}}
-                    </td>
-                    <td ng-if="selectedProgram && selectedProgram.id === activeEnrollment.program">
-                        <div class="this-active-program">{{programNames[activeEnrollment.program].name}}</div>
-                    </td>
-                </tr>
-            </table> 
-        </div>        
-    </div>
-</div>

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js	2015-12-11 08:53:57 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js	2015-12-11 15:18:54 +0000
@@ -92,9 +92,11 @@
             $scope.stickyDisabled = selectedLayout.stickRightSide ? !selectedLayout.stickRightSide : true;
 
             angular.forEach(selectedLayout.widgets, function(widget){
-                $rootScope[widget.title +'Widget'] = widget;
-                $rootScope.dashboardWidgets.push( $rootScope[widget.title +'Widget'] );
-                $scope.dashboardStatus[widget.title] = angular.copy(widget);
+                if(widget.title !== "activePrograms"){
+                    $rootScope[widget.title +'Widget'] = widget;
+                    $rootScope.dashboardWidgets.push( $rootScope[widget.title +'Widget'] );
+                    $scope.dashboardStatus[widget.title] = angular.copy(widget);
+                }                
             });
             
             angular.forEach(defaultLayout.widgets, function(w){

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment-controller.js	2015-12-07 08:53:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment-controller.js	2015-12-11 15:18:54 +0000
@@ -3,6 +3,7 @@
 trackerCapture.controller('EnrollmentController',
         function($rootScope,
                 $scope,  
+                $route,
                 $location,
                 $timeout,
                 DateUtils,
@@ -41,6 +42,13 @@
         $scope.programStageNames = selections.prStNames;
         $scope.attributesById = CurrentSelection.getAttributesById();
         
+        $scope.activeEnrollments =  [];
+        angular.forEach(selections.enrollments, function(en){
+            if(en.status === "ACTIVE" && $scope.selectedProgram && $scope.selectedProgram.id !== en.program){
+                $scope.activeEnrollments.push(en);                           
+            }
+        });
+        
         if($scope.selectedProgram){
             
             $scope.stagesById = [];        
@@ -201,4 +209,14 @@
         EnrollmentService.update($scope.selectedEnrollment).then(function(data){         
         });
     };
+    
+    $scope.changeProgram = function(program){
+        var pr = $location.search().program;
+        if(pr && pr === program){
+            $route.reload();            
+        }
+        else{
+            $location.path('/dashboard').search({tei: $scope.selectedTeiId, program: program});
+        }
+    };
 });

=== 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	2015-12-11 09:59:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html	2015-12-11 15:18:54 +0000
@@ -1,17 +1,7 @@
 <div class="panel panel-info" ng-controller="EnrollmentController">
 
-    <div class="panel-heading handle bold">
-
-        {{enrollmentWidget.title| translate}}
-        <span class="nav-pills" ng-show="selectedProgram && currentEnrollment && currentEnrollment !== selectedEnrollment">
-            | <a href ng-click="loadEnrollmentDetails(currentEnrollment)" title="{{'current'| translate}}"><span ng-class="{true: 'widget - link - active', false: 'widget - link'} [showEnrollmentDiv]">{{'current'| translate}}</span></a>
-        </span>
-        <span class="nav-pills" ng-show="selectedProgram && !currentEnrollment && !selectedTei.inactive">
-        	| <a href ng-click="showNewEnrollment()" title="{{'new'| translate}}"><span ng-class="{true: 'widget - link - active', false: 'widget - link'} [showEnrollmentDiv]">{{'new'| translate}}</span></a>
-        </span>
-        <span class="nav-pills" ng-show="hasEnrollmentHistory">
-            | <a href ng-click="showEnrollmentHistory()" title="{{'history'| translate}}"><span ng-class="{true: 'widget - link - active', false: 'widget - link'} [showEnrollmentHistoryDiv]">{{'history'| translate}}</span></a>
-        </span>       
+    <div class="panel-heading handle bold">        
+        {{enrollmentWidget.title| translate}}           
 
         <span class="pull-right widget-link">            
             <a class="small-horizonal-spacing" href ng-click="expandCollapse(enrollmentWidget)">
@@ -24,113 +14,143 @@
     <div ng-show="enrollmentWidget.expand" class="panel-body dashboard-widget-container">
         
         <!-- operations on selected enrollment begins -->
-        <div ng-if="selectedEnrollment.enrollment">
-
-            <table class="dhis2-list-table-striped dhis2-table-hover">
-                <tr>
-                    <td>
-                        {{'enrolling_orgunit' | translate}}
-                    </td>
-                    <td>
-                        <input type="text" class="form-control" value={{selectedEnrollment.orgUnitName}} ng-disabled="true"/>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        {{selectedProgram.enrollmentDateLabel}}
-                    </td>
-                    <td>
-                        <input type="text" placeholder="{{dhis2CalendarFormat.keyDateFormat}}" class="form-control" d2-date ng-model="selectedEnrollment.enrollmentDate" ng-disabled="true"/>
-                    </td>
-                </tr>
-                <tr ng-if="selectedProgram.displayIncidentDate">                    
-                    <td>
-                        {{selectedProgram.incidentDateLabel}}
-                    </td>
-                    <td>
-                        <input type="text" placeholder="{{dhis2CalendarFormat.keyDateFormat}}" class="form-control" d2-date ng-model="selectedEnrollment.incidentDate" ng-disabled="true"/>
-                    </td>
-                </tr>                
-            </table>
-
-            <div class="vertical-spacing">
-
-                <button type="button" 
-                        class="btn btn-primary"
-                        ng-disabled="selectedEnrollment.status !== 'ACTIVE' || selectedTei.inactive"
-                        ng-click="completeEnrollment()">
-                    {{'complete'| translate}}
-                </button>
-                <button type="button" 
-                        class="btn btn-warning"
-                        ng-disabled="selectedEnrollment.status !== 'ACTIVE' || selectedTei.inactive"
-                        ng-click="cancelEnrollment()">
-                    {{'cancel'| translate}}
-                </button>   
-
-                <button type="button"
-                        title="{{'unmark_for_followup'| translate}}"
-                        class="btn btn-danger horizonal-spacing"
-                        ng-disabled="selectedEnrollment.status !== 'ACTIVE' || selectedTei.inactive"
-                        ng-if="selectedEnrollment.followup"
-                        ng-click="markForFollowup()">
-                    <i class="fa fa-exclamation-triangle"></i>
-                </button>
-                <button type="button" 
-                        title="{{'mark_for_followup'| translate}}"
-                        class="btn btn-default horizonal-spacing"
-                        ng-disabled="selectedEnrollment.status !== 'ACTIVE' || selectedTei.inactive"
-                        ng-if="!selectedEnrollment.followup"
-                        ng-click="markForFollowup()">
-                    <i class="fa fa-exclamation-triangle"></i>
-                </button>
-
-            </div>
-
-        </div>
+        <div class="row">
+            <div class="col-sm-6 border-right">                
+                <div class="title small-vertical-spacing">
+                    {{'for_selected_program'| translate}}
+                    
+                    <span class="nav-pills" ng-show="selectedProgram && currentEnrollment && currentEnrollment !== selectedEnrollment">
+                        | <a href ng-click="loadEnrollmentDetails(currentEnrollment)" title="{{'current'| translate}}"><span ng-class="{true: 'widget-link-active', false: 'widget-link'} [showEnrollmentDiv]">{{'current'| translate}}</span></a>
+                    </span>
+                    <span class="nav-pills" ng-show="selectedProgram && !currentEnrollment && !selectedTei.inactive">
+                            | <a href ng-click="showNewEnrollment()" title="{{'new'| translate}}"><span ng-class="{true: 'widget-link-active', false: 'widget-link'} [showEnrollmentDiv]">{{'new'| translate}}</span></a>
+                    </span>
+                    <span class="nav-pills" ng-show="hasEnrollmentHistory">
+                        | <a href ng-click="showEnrollmentHistory()" title="{{'history'| translate}}"><span ng-class="{true: 'widget-link-active', false: 'widget - link'} [showEnrollmentHistoryDiv]">{{'history'| translate}}</span></a>
+                    </span>
+                </div>
+                <div ng-if="selectedEnrollment.enrollment">                    
+                    <table class="dhis2-list-table-striped dhis2-table-hover">
+                        <tr>
+                            <td>
+                                {{'enrolling_orgunit' | translate}}
+                            </td>
+                            <td>
+                                <input type="text" class="form-control" value={{selectedEnrollment.orgUnitName}} ng-disabled="true"/>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                {{selectedProgram.enrollmentDateLabel}}
+                            </td>
+                            <td>
+                                <input type="text" placeholder="{{dhis2CalendarFormat.keyDateFormat}}" class="form-control" d2-date ng-model="selectedEnrollment.enrollmentDate" ng-disabled="true"/>
+                            </td>
+                        </tr>
+                        <tr ng-if="selectedProgram.displayIncidentDate">                    
+                            <td>
+                                {{selectedProgram.incidentDateLabel}}
+                            </td>
+                            <td>
+                                <input type="text" placeholder="{{dhis2CalendarFormat.keyDateFormat}}" class="form-control" d2-date ng-model="selectedEnrollment.incidentDate" ng-disabled="true"/>
+                            </td>
+                        </tr>                
+                    </table>
+                    
+                    <div class="vertical-spacing">
+
+                        <button type="button" 
+                                class="btn btn-primary"
+                                ng-disabled="selectedEnrollment.status !== 'ACTIVE' || selectedTei.inactive"
+                                ng-click="completeEnrollment()">
+                            {{'complete'| translate}}
+                        </button>
+                        <button type="button" 
+                                class="btn btn-warning"
+                                ng-disabled="selectedEnrollment.status !== 'ACTIVE' || selectedTei.inactive"
+                                ng-click="cancelEnrollment()">
+                            {{'cancel'| translate}}
+                        </button>   
+
+                        <button type="button"
+                                title="{{'unmark_for_followup'| translate}}"
+                                class="btn btn-danger horizonal-spacing"
+                                ng-disabled="selectedEnrollment.status !== 'ACTIVE' || selectedTei.inactive"
+                                ng-if="selectedEnrollment.followup"
+                                ng-click="markForFollowup()">
+                            <i class="fa fa-exclamation-triangle"></i>
+                        </button>
+                        <button type="button" 
+                                title="{{'mark_for_followup'| translate}}"
+                                class="btn btn-default horizonal-spacing"
+                                ng-disabled="selectedEnrollment.status !== 'ACTIVE' || selectedTei.inactive"
+                                ng-if="!selectedEnrollment.followup"
+                                ng-click="markForFollowup()">
+                            <i class="fa fa-exclamation-triangle"></i>
+                        </button>
+
+                    </div>
+                </div>
+                
+                <!-- various alerts begin -->
+                <div ng-if="selectedProgram && !selectedEnrollment && !showEnrollmentDiv && !hasEnrollmentHistory">
+                    <div class="alert alert-warning">{{'not_yet_enrolled_enrollment'| translate}}</div>
+                </div>
+                <div ng-if="selectedProgram && !selectedEnrollment && !showEnrollmentDiv && !showEnrollmentHistoryDiv && hasEnrollmentHistory">
+                    <div class="alert alert-warning">{{'no_active_enrollment_exists'| translate}}</div>
+                </div>
+                <div ng-if="!selectedProgram && programExists">
+                    <div class="alert alert-danger">{{'please_select_a_program_for_enrollment'| translate}}</div> 
+                </div>
+                <div ng-if="!programExists">
+                    <div class="alert alert-danger">{{'no_program_exists_enrollment'| translate}}</div> 
+                </div>
+                <!-- various alerts end -->
+                
+                <!-- operations on historical enrollment begins -->
+                <div ng-if="showEnrollmentHistoryDiv && !selectedEnrollment">
+                    <table class="table table-striped dhis2-table-hover table-bordered">
+                        <tr>
+                            <th>
+                                {{selectedProgram.enrollmentDateLabel}}
+                            </th>
+                            <th ng-if="selectedProgram.displayIncidentDate">
+                                {{selectedProgram.incidentDateLabel}}
+                            </th>
+                        </tr>
+                        <tr ng-click="loadEnrollmentDetails(en)" ng-repeat="en in historicalEnrollments" title="{{'details'| translate}}">
+                            <td>
+                                {{en.enrollmentDate}}
+                            </td>
+                            <td ng-if="selectedProgram.displayIncidentDate">
+                                {{en.incidentDate}}
+                            </td>
+                        </tr>
+                    </table>
+                </div>
+                <!-- operations on historical enrollment ends -->
+            </div>
+            <div class="col-sm-6" ng-if="!showEnrollmentDiv">
+                <div class="title small-vertical-spacing">{{'for_other_programs'| translate}}</div>                
+                <div ng-if="activeEnrollments.length > 0">
+                    <table class="table table-striped dhis2-table-hover table-bordered">
+                        <tr ng-repeat="activeEnrollment in activeEnrollments">
+                            <td ng-if="selectedProgram && selectedProgram.id !== activeEnrollment.program || !selectedProgram" title="{{'set_as_current'| translate}}" ng-click="changeProgram(activeEnrollment.program)">
+                                {{programNames[activeEnrollment.program].name}}
+                            </td>
+                        </tr>
+                    </table> 
+                </div>
+                <div ng-if="activeEnrollments.length === 0">
+                    <div class="alert alert-info">{{'no_active_enrollments_exist'| translate}}</div>
+                </div>                
+            </div>
+        </div>        
         <!-- operations on selected enrollment ends -->
 
         <!-- new enrollment registration form begins -->
         <div ng-if="showEnrollmentDiv" ng-include="'components/registration/registration.html'"></div>
         <!-- new enrollment registration form ends -->
 
-        <!-- operations on historical enrollment begins -->
-        <div ng-if="showEnrollmentHistoryDiv && !selectedEnrollment">
-            <table class="table table-striped dhis2-table-hover table-bordered">
-                <tr>
-                    <th>
-                        {{selectedProgram.enrollmentDateLabel}}
-                    </th>
-                    <th ng-if="selectedProgram.displayIncidentDate">
-                        {{selectedProgram.incidentDateLabel}}
-                    </th>
-                </tr>
-                <tr ng-click="loadEnrollmentDetails(en)" ng-repeat="en in historicalEnrollments" title="{{'details'| translate}}">
-                    <td>
-                        {{en.enrollmentDate}}
-                    </td>
-                    <td ng-if="selectedProgram.displayIncidentDate">
-                        {{en.incidentDate}}
-                    </td>
-                </tr>
-            </table>
-        </div>
-        <!-- operations on historical enrollment ends -->
-
-        <!-- various alerts begin -->
-        <div ng-if="selectedProgram && !selectedEnrollment && !showEnrollmentDiv && !hasEnrollmentHistory">
-            <div class="alert alert-warning">{{'not_yet_enrolled_enrollment'| translate}}</div> 
-        </div>
-        <div ng-if="selectedProgram && !selectedEnrollment && !showEnrollmentDiv && !showEnrollmentHistoryDiv && hasEnrollmentHistory">
-            <div class="alert alert-warning">{{'no_active_enrollment_exists'| translate}}</div> 
-        </div>
-        <div ng-if="!selectedProgram && programExists">
-            <div class="alert alert-danger">{{'please_select_a_program_for_enrollment'| translate}}</div> 
-        </div>
-        <div ng-if="!programExists">
-            <div class="alert alert-danger">{{'no_program_exists_enrollment'| translate}}</div> 
-        </div>
-        <!-- various alerts end -->
-
     </div>
 </div>

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties	2015-12-07 08:53:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties	2015-12-11 15:18:54 +0000
@@ -20,7 +20,8 @@
 no_program_exists_report=No programs exist for the selected org unit. Reporting not possible.
 not_yet_enrolled_data_entry=Not yet enrolled. Data entry not possible.
 not_yet_enrolled_enrollment=Not yet enrolled. Please enroll.
-no_active_enrollment_exists=No active enrollments exist for the selected program
+no_active_enrollment_exists=No active enrollment exist for the selected program
+no_active_enrollments_exist=No active enrollments exist
 not_yet_enrolled_note=Not yet enrolled. Note recording not possible.
 not_yet_enrolled_report=Not yet enrolled. Reporting not possible.
 no_data_report=No records exist for reporting
@@ -117,6 +118,8 @@
 search_attributes=Search attributes
 available_search_attributes=Available search attributes
 selected_search_attributes=Selected search attributes
+for_selected_program=For selected program
+for_other_programs=For other programs
 search_for_dashboard=Search for dashboard items
 dashboard=Dashboard
 home=Home
@@ -189,7 +192,6 @@
 current_selections=Current selections
 activePrograms=Active programs
 set_as_current=Set as current
-no_active_programs_exist=No active programs exist
 org_unit=Organisation unit
 org_unit_scope=Organisation unit scope
 SELECTED=Selected

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/index.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/index.html	2015-12-02 16:59:35 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/index.html	2015-12-11 15:18:54 +0000
@@ -104,7 +104,6 @@
         <script type="text/javascript" src="components/profile/profile-controller.js"></script>        
         <script type="text/javascript" src="components/notes/notes-controller.js"></script>
         <script type="text/javascript" src="components/rulebound/rulebound-controller.js"></script>
-        <script type="text/javascript" src="components/activeprograms/active-programs-controller.js"></script>
 
         <!-- Menu scripts -->
         <script type="text/javascript" src="../dhis-web-commons/javascripts/dhis2/dhis2.translate.js"></script>

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js	2015-12-10 22:51:07 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js	2015-12-11 15:18:54 +0000
@@ -28,8 +28,7 @@
     w.reportWidget = {title: 'report', view: "components/report/tei-report.html", show: true, expand: true, parent: 'biggerWidget', order: 3};
     w.selectedWidget = {title: 'current_selections', view: "components/selected/selected.html", show: false, expand: true, parent: 'smallerWidget', order: 0};
     w.feedbackWidget = {title: 'feedback', view: "components/rulebound/rulebound.html", show: true, expand: true, parent: 'smallerWidget', order: 1};
-    w.profileWidget = {title: 'profile', view: "components/profile/profile.html", show: true, expand: true, parent: 'smallerWidget', order: 2};
-    w.activeProgramsWidget = {title: 'activePrograms', view: "components/activeprograms/active-programs.html", show: false, expand: true, parent: 'smallerWidget', order: 3};
+    w.profileWidget = {title: 'profile', view: "components/profile/profile.html", show: true, expand: true, parent: 'smallerWidget', order: 2};    
     w.relationshipWidget = {title: 'relationships', view: "components/relationship/relationship.html", show: true, expand: true, parent: 'smallerWidget', order: 4};
     w.notesWidget = {title: 'notes', view: "components/notes/notes.html", show: true, expand: true, parent: 'smallerWidget', order: 5};            
     var defaultLayout = new Object();

=== 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-12-11 09:08:26 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css	2015-12-11 15:18:54 +0000
@@ -47,6 +47,12 @@
     color: #585D61;
 }
 
+.title {
+    font-size: 14pt;
+    font-weight: normal;
+    color: #585D61;
+}
+
 .dashboard-top-bar {
     padding-right: 15px;
     padding-left: 15px;
@@ -1224,4 +1230,7 @@
     word-wrap: break-word;
 }
 
+.border-right {
+    border-right: 1px dotted #3a87ad;
+}