=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js	2014-05-27 12:38:36 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js	2014-05-27 14:50:29 +0000
@@ -10,7 +10,7 @@
     TranslationService.translate();
      
     //listen for the selected items
-    $scope.$on('dataentry', function(event, args) {  
+    $scope.$on('dashboard', function(event, args) {  
         
         var today = moment();
         today = Date.parse(today);
@@ -43,11 +43,11 @@
                     if($scope.selectedEnrollment.status === 'ACTIVE'){
                         //create events for the selected enrollment
                         var program = storage.get($scope.selectedProgramId);
-                        var programStages = [];
+                        //var programStages = [];
                         
                         angular.forEach(program.programStages, function(ps){  
                             ps = storage.get(ps.id);
-                            programStages.push(ps);
+                            //programStages.push(ps);
                             
                             var eventDate = moment(moment().add('d', ps.minDaysFromStart), 'YYYY-MM-DD')._d;
                             eventDate = Date.parse(eventDate);

=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment-controller.js'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment-controller.js	2014-05-27 12:38:36 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment-controller.js	2014-05-27 14:50:29 +0000
@@ -66,21 +66,25 @@
                     $scope.selectedEnrollment.dateOfIncident = $filter('date')($scope.selectedEnrollment.dateOfIncident, 'yyyy-MM-dd');
                 }
                 
-                $rootScope.$broadcast('dataentry', {selectedEntity: $scope.selectedEntity,
+                $rootScope.$broadcast('dashboard', {selectedEntity: $scope.selectedEntity,
                                                     selectedOrgUnit: $scope.selectedOrgUnit,
                                                     selectedProgramId: $scope.selectedProgram.id,
                                                     selectedEnrollment: $scope.selectedEnrollment});
             });            
         }
         
-        $rootScope.$broadcast('dataentry', {selectedEntity: $scope.selectedEntity,
+        /*$rootScope.$broadcast('dashboard', {selectedEntity: $scope.selectedEntity,
                                                     selectedOrgUnit: $scope.selectedOrgUnit,
                                                     selectedProgramId: $scope.selectedProgram ? $scope.selectedProgram.id : null,
-                                                    selectedEnrollment: $scope.selectedEnrollment ? $scope.selectedEnrollment : null});
+                                                    selectedEnrollment: $scope.selectedEnrollment ? $scope.selectedEnrollment : null});*/
         
     };
     
+    
+    
     $scope.showEnrollment = function(){        
+        $scope.showEnrollmentDiv = !$scope.showEnrollmentDiv;
+        
         console.log('Enrollment', $scope.selectedEntity, ' ', $scope.selectedProgram);
     };
     

=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html	2014-05-27 12:38:36 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html	2014-05-27 14:50:29 +0000
@@ -5,40 +5,38 @@
             <a href ng-click="removeWidget(enrollmentWidget)" title="{{'remove'| translate}}"><span class='black'><i class="fa fa-times-circle"></i></span></a>            
         </span>
     </div>
-    <table class="table-borderless">
+    <table class="table-borderless table-striped">
         <tr>
-            <td>
+            <!--<td>
                 {{'program'| translate}}
-            </td>
+            </td>-->
             <td>
                 <select ng-model="selectedProgram"
                         class="form-control"
                         ng-options="program as program.name for program in programs | orderBy: 'name'" 
                         ng-change="loadEvents()">
-                    <option value="">{{'please_select'| translate}}</option>
+                    <option value="">{{'please_select_a_program'| translate}}</option>
                 </select>
             </td>
-            <td>
+            <td ng-if="selectedProgram && !selectedEnrollment" >
                 <button type="button" 
                         class="btn btn-default"
-                        ng-show="selectedProgram && !selectedEnrollment" 
                         ng-click="showEnrollment()">
                     {{'enroll'| translate}}
                 </button>  
             </td>                
-            <td>
+            <td ng-if="selectedProgram && selectedEnrollment" >
                 <button type="button" 
                         class="btn btn-default"
-                        ng-show="selectedProgram && selectedEnrollment" 
                         ng-click="scheduling()">
                     {{'scheduling'| translate}}
                 </button>                                
             </td>
         </tr>
     </table>
+
     <div ng-if="selectedProgram">
-        <div ng-if="programStages">
-            
+        <div ng-if="programStages">            
             <hr>
             <table class="table-borderless table-striped">
                 <thead>
@@ -62,5 +60,8 @@
                 </tr>
             </table>
         </div>
+        <div ng-if="showEnrollmentDiv">
+            
+        </div>
     </div>    
 </div>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/registration/registration-controller.js'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/registration/registration-controller.js	2014-05-27 12:38:36 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/registration/registration-controller.js	2014-05-27 14:50:29 +0000
@@ -7,15 +7,17 @@
                 DialogService,
                 storage,
                 TranslationService) {
-    
+
     //do translation of the registration page
     TranslationService.translate();   
+    
     $scope.selectedOrgUnit = storage.get('SELECTED_OU');
     $scope.enrollment = {enrollmentDate: '', incidentDate: ''};    
     
     $scope.attributes = AttributesFactory.getWithoutProgram();
-    $scope.trackedEntities = {available: storage.get('TRACKED_ENTITIES')};
-    
+    $scope.trackedEntities = {available: []};
+    $scope.trackedEntities.available = storage.get('TRACKED_ENTITIES');
+   
     $scope.trackedEntities.selected = $scope.trackedEntities.available[0];
       
     //watch for selection of org unit from tree

=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/registration/registration.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/registration/registration.html	2014-05-27 12:38:36 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/registration/registration.html	2014-05-27 14:50:29 +0000
@@ -1,4 +1,4 @@
-<div class="bordered-div col-md-12">    
+<div class="bordered-div col-md-12" ng-controller="RegistrationController">    
     <div class="registration-container">
         <form name="outerForm" novalidate>
             

=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/index.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/index.html	2014-05-27 12:38:36 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/index.html	2014-05-27 14:50:29 +0000
@@ -63,6 +63,7 @@
         <script type="text/javascript" src="scripts/filters.js"></script>
         <script type="text/javascript" src="scripts/directives.js"></script>
         <script type="text/javascript" src="scripts/controllers.js"></script>
+        <script type="text/javascript" src="components/registration/registration-controller.js"></script>
         <script type="text/javascript" src="components/enrollment/enrollment-controller.js"></script>
         <script type="text/javascript" src="components/dataentry/dataentry-controller.js"></script>
         <script type="text/javascript" src="components/selected/selected-controller.js"></script>

=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js	2014-05-27 12:38:36 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js	2014-05-27 14:50:29 +0000
@@ -7,8 +7,8 @@
 .controller('SelectionController',
         function($rootScope,
                 $scope,
+                $modal,
                 $location,
-                $modal,
                 Paginator,
                 TranslationService, 
                 storage,
@@ -251,11 +251,10 @@
         });
     };
     
-    $scope.showDashboard = function(currentEntity){
-        
+    $scope.showDashboard = function(currentEntity){        
         $location.path('/dashboard').search({selectedEntityId: currentEntity.id,                                            
                                             selectedProgramId: $scope.selectedProgram ? $scope.selectedProgram.id: null});                                    
-    };  
+    };
        
     $scope.getHelpContent = function(){
         console.log('I will get help content');

=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/styles/style.css'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/styles/style.css	2014-05-27 12:38:36 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/styles/style.css	2014-05-27 14:50:29 +0000
@@ -570,6 +570,7 @@
 
 .horizonal-spacing{
     margin-left: 10px;    
+    margin-right: 10px;    
 }
 
 .vertical-spacing{

=== removed file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/dataentry.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/dataentry.html	2014-05-27 12:38:36 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/dataentry.html	1970-01-01 00:00:00 +0000
@@ -1,103 +0,0 @@
-<div class="panel panel-default" ng-controller="DataEntryController">
-    <div class="panel-heading">
-        {{dataentryWidget.title| translate}} 
-        <span class="nav-pills" ng-show="selectedEnrollment && allowEventCreation">
-            | <span><a href ng-click="createNewEvent()" title="{{'create_new_event_repeatable'| translate}}">{{'create_new_event'| translate}}</a></span>            
-        </span>
-        <span class="pull-right">
-            <a href ng-click="removeWidget(dataentryWidget)" title="{{'remove'| translate}}"><span class='black'><i class="fa fa-times-circle"></i></span></a>            
-        </span>        
-    </div>
-
-    <div ng-show="dhis2Events">            
-        <table class="table-borderless">
-            <tbody>
-                <tr>
-                    <td class="inline-block" ng-repeat="dhis2Event in dhis2Events track by $index">
-                        <span class="block orgunit-container">{{dhis2Event.orgUnitName}}</span>                                              
-                        <span class="stage-container"                                                     
-                              ng-class="{'current-stage': currentEvent.programStage == dhis2Event.programStage, '{{dhis2Event.statusColor}}': true}"                                                      
-                              ng-click="showDataEntry(dhis2Event)">
-                            {{dhis2Event.name}}<br/>
-                            {{dhis2Event.eventDate}}                                                    
-                        </span>
-                        <i class="fa fa-arrow-right" ng-show="$index < dhis2Events.length-1"></i>
-                    </td>                        
-                </tr>
-            </tbody>                
-        </table>
-        <hr>
-        <div ng-show="currentEvent">
-            <table class="table-borderless table-striped">
-                <thead>
-                    <tr>
-                        <th>
-                            {{'data_element' | translate}}
-                        </th>
-                        <th>
-                            {{'value' | translate}}
-                        </th>
-                        <th>
-                            {{'provided_elsewhere' | translate}}
-                        </th>
-                    </tr>
-                </thead>
-                    
-                <tr ng-repeat="prStDe in currentStage.programStageDataElements">
-                    <td>
-                        {{prStDe.dataElement.name}}-{{prStDe.dataElement.type}}
-                    </td>
-                    <td>
-                        <div ng-switch="prStDe.dataElement.type">
-                            <div ng-switch-when="int">
-                                <input type="number"
-                                       class="form-control"
-                                       ng-model="currentEvent[prStDe.dataElement.id]" 
-                                       ng-required={{prStDe.compulsory}} 
-                                       name="foo"/>
-                            </div>
-                            <div ng-switch-when="string">                                        
-                                <input type="text"
-                                       class="form-control"
-                                       ng-model="currentEvent[prStDe.dataElement.id]" 
-                                       ng-required={{prStDe.compulsory}} 
-                                       typeahead="option for option in prStDe.dataElement.optionSet.options | filter:$viewValue | limitTo:20" 
-                                       typeahead-open-on-focus                                                        
-                                       name="foo"/>
-                            </div>
-                            <div ng-switch-when="bool">
-                                <select class="form-control"
-                                        ng-model="currentEvent[prStDe.dataElement.id]" 
-                                        ng-required={{prStDe.compulsory}} 
-                                        name="foo">
-                                    <option value="">{{'please_select'| translate}}</option>                        
-                                    <option value="0">{{'no'| translate}}</option>
-                                    <option value="1">{{'yes'| translate}}</option>
-                                </select>
-
-                            </div>
-                            <div ng-switch-when="date">
-                                <input type="text" 
-                                       placeholder="yyyy-mm-dd" 
-                                       ng-date 
-                                       class="form-control"
-                                       ng-model="currentEvent[prStDe.dataElement.id]" 
-                                       ng-required={{prStDe.compulsory}}  
-                                       name="foo"/>
-                            </div>
-                        </div>
-                    </td>
-                    <td>                        
-                        <span ng-if="prStDe.allowProvidedElsewhere">
-                            <input type="checkbox" ng-model="currentEvent.providedElsewhere[prStDe.dataElement.id]"/>
-                        </span>
-                    </td>
-                </tr>
-            </table>    
-            
-            <hr>
-
-        </div>
-    </div>
-
-</div>
\ No newline at end of file

=== removed file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/enrollment.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/enrollment.html	2014-05-27 12:38:36 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/enrollment.html	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-<div class="panel panel-default" ng-controller="EnrollmentController">
-    <div class="panel-heading">
-        {{enrollmentWidget.title| translate}}
-        <span class="pull-right">
-            <a href ng-click="removeWidget(enrollmentWidget)" title="{{'remove'| translate}}"><span class='black'><i class="fa fa-times-circle"></i></span></a>            
-        </span>
-    </div>
-    <table class="table-borderless">
-        <tr>
-            <td>
-                {{'program'| translate}}
-            </td>
-            <td>
-                <select ng-model="selectedProgram"
-                        class="form-control"
-                        ng-options="program as program.name for program in programs | orderBy: 'name'" 
-                        ng-change="loadEvents()">
-                    <option value="">{{'please_select'| translate}}</option>
-                </select>
-            </td>
-            <td>
-                <button type="button" 
-                        class="btn btn-default"
-                        ng-show="selectedProgram && !selectedEnrollment" 
-                        ng-click="showEnrollment()">
-                    {{'enroll'| translate}}
-                </button>  
-            </td>                
-            <td>
-                <button type="button" 
-                        class="btn btn-default"
-                        ng-show="selectedProgram && selectedEnrollment" 
-                        ng-click="scheduling()">
-                    {{'scheduling'| translate}}
-                </button>                                
-            </td>
-        </tr>
-    </table>
-    <div ng-if="selectedProgram">
-        <div ng-if="programStages">
-            
-            <hr>
-            <table class="table-borderless table-striped">
-                <thead>
-                    <tr>
-                        <th>
-                            {{'program_stage'| translate}}
-                        </th>
-                        <th>
-                            {{'scheduled_date'| translate}}
-                        </th>
-                    </tr>                
-                </thead>
-                <tr ng-repeat="programStage in programStages">
-                    <td>
-                        {{programStage.name}}
-                    </td>
-                    <td>
-                        {{programStage.minDaysFromStart}}
-                        {{selectedEnrollment.dateOfIncident}}
-                    </td>
-                </tr>
-            </table>
-        </div>
-    </div>    
-</div>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/home.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/home.html	2014-05-27 12:38:36 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/home.html	2014-05-27 14:50:29 +0000
@@ -53,15 +53,7 @@
     </div>
 
     <div class="row vertical-spacing">
-        <div id="selectDropDownParent" class="input-group col-md-6">
-            
-            <!--<input type="text"
-                   class="form-control"
-                   ng-model="program"
-                   typeahead="program.name for program in programs | filter:$viewValue | limitTo:20" 
-                   typeahead-open-on-focus>-->
-            
-            
+        <div id="selectDropDownParent" class="input-group col-md-6">            
             <button type="button" class="select-drop-down-button form-control" >{{selectedProgram ? selectedProgram.name : 'please_select_a_program'| translate}}</button>
             <div class="input-group-btn">
                 <button class="btn btn-default trim" type="button" title="{{'list_programs'| translate}}" data-toggle="dropdown"><i class="fa fa-caret-down"></i></button>
@@ -94,7 +86,7 @@
     <!--registration begins -->
     <div class="row" ng-if="showRegistrationDiv">
         <div class="col-md-6">
-            <div ng-include="'components/registration/registration.html'" ng-controller="RegistrationController"></div>             
+            <div ng-include="'components/registration/registration.html'"></div>             
         </div>
     </div>
     <!-- registration ends -->

=== removed file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/notes.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/notes.html	2014-04-03 12:27:23 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/notes.html	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-<div class="panel panel-default" ng-controller="NotesController">
-    <div class="panel-heading">
-        {{notesWidget.title| translate}}
-        <span class="pull-right">
-            <a href ng-click="removeWidget(notesWidget)" title="{{'remove'| translate}}"><span class='black'><i class="fa fa-times-circle"></i></span></a>            
-        </span>        
-    </div>
-    <div class="panel-body dashboard-element-container">
-        This is notes.
-    </div>
-</div>
\ No newline at end of file

=== removed file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/profile.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/profile.html	2014-05-21 14:59:16 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/profile.html	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-
-<div class="panel panel-default" ng-controller="ProfileController">
-    <div class="panel-heading">
-        {{trackedEntity.name|| 'entity' | translate}} {{profileWidget.title| translate}}
-        <span class="nav-pills" ng-show="selectedEntity.attributes.length">
-            | <span><a href ng-click="showEdit()" title="{{'edit_profile'| translate}}">{{'edit'| translate}}</a></span>            
-        </span>
-        <span class="pull-right">
-            <a href ng-click="removeWidget(profileWidget)" title="{{'remove'| translate}}"><span class='black'><i class="fa fa-times-circle"></i></span></a>            
-        </span>        
-    </div>
-    <table class="table table-striped table-hover">
-        <tr ng-repeat="attribute in selectedEntity.attributes">
-            <td>
-                {{attribute.displayName}}
-            </td>
-            <td>
-                <div ng-switch="attribute.type">
-                    <div ng-switch-when="date">
-                        <input type="text" class="form-control" ng-date ng-model="attribute.value"  value="attribute.value | date:'yyyy-MM-dd" ng-disabled="!editProfile"/>
-                    </div>
-                    <div ng-switch-when="trueOnly">
-                        <input type="checkbox" class="form-control" ng-model="attribute.value" ng-disabled="!editProfile"/>
-                    </div>
-                    <div ng-switch-when="bool">
-                        <select ng-model="attribute.value" class="form-control" ng-disabled="!editProfile">
-                            <option value="">{{'please_select'| translate}}</option>                        
-                            <option value="0">{{'no'| translate}}</option>
-                            <option value="1">{{'yes'| translate}}</option>
-                        </select>
-                    </div>
-                    <div ng-switch-when="combo">
-                        <input type="text"  
-                               class="form-control"
-                               ng-model="attribute.value"                                                 
-                               typeahead="option for option in attributes[attribute.attribute].optionSet.options | filter:$viewValue | limitTo:20" 
-                               typeahead-open-on-focus 
-                               ng-disabled="!editProfile"/>
-                    </div>
-                    <div ng-switch-when="number">
-                        <input type="number" class="form-control" ng-model="attribute.value" ng-disabled="!editProfile"/>
-                    </div>
-                    <div ng-switch-default>
-                        <input type="text"  class="form-control" ng-model="attribute.value" ng-disabled="!editProfile"/>                         
-                    </div>
-                </div>                                                                                                    
-            </td>
-        </tr>           
-    </table>
-
-    <div class="widget-content-container" ng-if="editProfile">
-
-        <button type="button" 
-                class="btn btn-default small-horizonal-spacing"
-                ng-click="save()">
-            {{'save'| translate}}
-        </button>        
-        <button type="button" 
-                class="btn btn-default small-horizonal-spacing" 
-                ng-click="cancel()">
-            {{'cancel'| translate}}
-        </button>        
-
-    </div>
-
-</div>
\ No newline at end of file

=== removed file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/registration.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/registration.html	2014-05-27 12:38:36 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/registration.html	1970-01-01 00:00:00 +0000
@@ -1,91 +0,0 @@
-<div class="bordered-div col-md-12">    
-    <div class="registration-container">
-        <form name="outerForm" novalidate>
-            
-            <div ng-if='!selectedProgram'>
-                <h3>{{'category' | translate}}</h3>
-                 <table class="table-borderless table-striped">
-                    <tr>
-                        <td>
-                            {{'entity_type' | translate}}
-                        </td>
-                        <td>
-                            <select class="form-control" ng-model="trackedEntities.selected" ng-options="trackedEntity.name for trackedEntity in trackedEntities.available | orderBy: 'name'">                                
-                            </select>                            
-                        </td>
-                    </tr>                   
-                </table>
-                <hr>
-            </div>
-            
-            <h3>{{'profile' | translate}}</h3>
-            <table class="table-borderless table-striped">
-                <tr ng-repeat="attribute in attributes">
-                    <td>
-                        {{attribute.name}}
-                    </td>
-                    <td>
-                        <div ng-switch="attribute.valueType">
-                            <div ng-switch-when="date">
-                                <input type="text" class="form-control" ng-date ng-model="attribute.value" />
-                            </div>
-                            <div ng-switch-when="trueOnly">
-                                <input type="checkbox" class="form-control" ng-model="attribute.value" />
-                            </div>
-                            <div ng-switch-when="bool">
-                                <select ng-model="attribute.value" class="form-control">
-                                    <option value="">{{'please_select'| translate}}</option>                        
-                                    <option value="0">{{'no'| translate}}</option>
-                                    <option value="1">{{'yes'| translate}}</option>
-                                </select>
-                            </div>
-                            <div ng-switch-when="combo">
-                                <input type="text" 
-                                       class="form-control"
-                                       ng-model="attribute.value"                                                 
-                                       typeahead="option for option in attribute.optionSet.options | filter:$viewValue | limitTo:20" 
-                                       typeahead-open-on-focus 
-                                       />
-                            </div>
-                            <div ng-switch-when="number">
-                                <input type="number" class="form-control" ng-model="attribute.value"/>
-                            </div>
-                            <div ng-switch-default>
-                                <input type="text" class="form-control" ng-model="attribute.value" />                                        
-                            </div>
-                        </div>                                                                                                    
-                    </td>
-                </tr>                        
-            </table>
-            
-            <div ng-if='selectedProgram'>
-                <hr>
-                <h3>{{'enrollment' | translate}}</h3>
-                <table class="dhis2-list-table-striped dhis2-table-hover">
-                    <tr>
-                        <td>
-                            {{selectedProgram.dateOfEnrollmentDescription}}
-                        </td>
-                        <td>
-                            <input type="text" class="form-control" ng-date ng-model="enrollment.incidentDate" />
-                        </td>
-                    </tr>     
-                    <tr ng-if="selectedProgram.displayIncidentDate">
-                        <td>
-                            {{selectedProgram.dateOfIncidentDescription}}
-                        </td>
-                        <td>
-                            <input type="text" class="form-control" ng-date ng-model="enrollment.enrollmentDate" />
-                        </td>
-                    </tr>
-                </table>
-            </div>
-            
-            <div class="vertical-spacing">                
-                <button type="button" class="btn btn-default" ng-click="registerEntity(true)">{{'save_and_continue'| translate}}</button>
-                <button type="button" class="btn btn-default small-horizonal-spacing" ng-click="registerEntity(false)">{{'save_and_add_new'| translate}}</button>
-                <button type="button" class="btn btn-default small-horizonal-spacing" ng-click="showRegistration()">{{'cancel'| translate}}</button>
-            </div>
-        </form>
-    </div>
-</div>
\ No newline at end of file

=== removed file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/relationship.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/relationship.html	2014-05-13 09:54:48 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/relationship.html	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-<div class="panel panel-default" ng-controller="RelationshipController">
-    <div class="panel-heading">
-        {{relationshipWidget.title| translate}}
-        <span class="pull-right">
-            <a href ng-click="removeWidget(relationshipWidget)" title="{{'remove'| translate}}"><span class='black'><i class="fa fa-times-circle"></i></span></a>            
-        </span>        
-    </div>
-    <div class="panel-body dashboard-element-container">
-        This is relationships.
-    </div>
-</div>
\ No newline at end of file

=== removed file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/selected.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/selected.html	2014-04-04 11:55:55 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/selected.html	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-<div class="panel panel-default" ng-controller="SelectedInfoController">
-    <div class="panel-heading">
-        {{selectedWidget.title| translate}}
-        <span class="pull-right">
-            <a href ng-click="removeWidget(selectedWidget)" title="{{'remove'| translate}}"><span class='black'><i class="fa fa-times-circle"></i></span></a>            
-        </span>        
-    </div>    
-    <div class="panel-body dashboard-element-container">
-        <div class="row" ng-repeat="selection in selections">
-            <div class="col-sm-6">
-                {{selection.title| translate}}
-            </div>
-            <div class="col-sm-6">
-                <input type="text" class="form-control" value="{{selection.value| translate}}" ng-disabled="true"/>                
-            </div>
-        </div>        
-    </div>
-</div>