diff --git a/src/Controller/FeedbacksController.php b/src/Controller/FeedbacksController.php
index ae0089c6e..544dc83a4 100755
--- a/src/Controller/FeedbacksController.php
+++ b/src/Controller/FeedbacksController.php
@@ -81,11 +81,7 @@ public function add()
 
         if ($this->Auth->User('id')) {
             $this->paginate['limit'] = 5;
-            $previous_messages = $this->paginate($this->Feedbacks);
-            // $this->paginate['conditions'] = array('user_id' => $this->Auth->User('id'));
-            // 
-            // $previous_messages = $this->Feedback->find('all', array('conditions' => array('id' => $this->Auth->User('id'))));
-            // $previous_messages = $this->paginate();
+            $previous_messages = $this->paginate($this->Feedbacks); 
         }
         $users = $this->Feedbacks->Users->find('list', ['limit' => 200])->all();
         $this->set(compact('feedback', 'users'));
diff --git a/src/Controller/Manager/AggregatesController.php b/src/Controller/Manager/AggregatesController.php
index f19538f3a..0158b71c7 100755
--- a/src/Controller/Manager/AggregatesController.php
+++ b/src/Controller/Manager/AggregatesController.php
@@ -13,6 +13,9 @@
  */
 class AggregatesController extends AppController
 {
+
+
+    public $page_options = array('5' => '5', '10' => '10', '25' => '25', '50' => '50', '100' => '100');
     /**
      * Index method
      *
@@ -20,11 +23,16 @@ class AggregatesController extends AppController
      */
     public function index()
     {
+        
+        $limit = $this->request->getQuery('pages', 1000); // Default to 10 if 'pages' is not set
+       
         $this->paginate = [
             'contain' => ['Users', 'Counties', 'SubCounties', 'Designations'],
-        ];
-        $aggregates = $this->paginate($this->Aggregates);
-
+            'limit'=>$limit
+        
+        ]; 
+        $aggregates = $this->paginate($this->Aggregates->find('search', ['search' => $this->request->getQuery()]));
+        $this->set('page_options', $this->page_options);
         $this->set(compact('aggregates'));
     }
 
diff --git a/src/Controller/Manager/DrugsController.php b/src/Controller/Manager/DrugsController.php
index 461ef2078..4158653ad 100755
--- a/src/Controller/Manager/DrugsController.php
+++ b/src/Controller/Manager/DrugsController.php
@@ -25,7 +25,15 @@ class DrugsController extends AppController
      */
     public function index()
     {
-        $drugs = $this->paginate($this->Drugs);
+
+        $limit = $this->request->getQuery('pages', 1000); // Default to 10 if 'pages' is not set
+       
+        $this->paginate = [
+            'contain' => [],
+            'limit'=>$limit
+        
+        ]; 
+        $drugs = $this->paginate($this->Drugs->find('search', ['search' => $this->request->getQuery()]));
         $this->set('page_options', $this->page_options);
         $this->set(compact('drugs'));
     }
diff --git a/src/Controller/Manager/ReportsController.php b/src/Controller/Manager/ReportsController.php
index 93d113cb4..4ae5ac7b8 100755
--- a/src/Controller/Manager/ReportsController.php
+++ b/src/Controller/Manager/ReportsController.php
@@ -6,9 +6,8 @@
 use App\Controller\AppController;
 
 /**
- * Reports Controller
- *
- * @method \App\Model\Entity\Report[]|\Cake\Datasource\ResultSetInterface paginate($object = null, array $settings = [])
+ *  
+ * 
  */
 class ReportsController extends AppController
 {
@@ -19,7 +18,8 @@ class ReportsController extends AppController
      */
     public function index()
     {
-        $reports = $this->paginate($this->Reports);
+       
+        $reports =[]; 
 
         $this->set(compact('reports'));
     }
diff --git a/src/Controller/Manager/SaefisController.php b/src/Controller/Manager/SaefisController.php
index 445b94545..0ec523960 100755
--- a/src/Controller/Manager/SaefisController.php
+++ b/src/Controller/Manager/SaefisController.php
@@ -22,22 +22,17 @@ class SaefisController extends AppController
      */
     public function index()
     { 
-        $criteria = array();
-
-        // $criteria['Aefis.user_id'] = $this->Auth->user('id');
+    
+        $limit = $this->request->getQuery('pages', 1000); // Default to 10 if 'pages' is not set
+       
         $this->paginate = [
-            'contain' => ['Users'],
-            'conditions' => $criteria
-        ];
-        $saefis = $this->paginate($this->Saefis);
-
+            'contain' => [],
+            'limit'=>$limit
+        
+        ]; 
+        $saefis = $this->paginate($this->Saefis->find('search', ['search' => $this->request->getQuery()]));
         $this->set('page_options', $this->page_options);
         $this->set(compact('saefis'));
-
-        // $counties = $this->Saefis->Counties->find('list', array('order' => array('Counties.county_name' => 'ASC')));
-        // $this->set(compact('counties'));
-        // $designations = $this->Saefis->Designations->find('list', array('order' => array('Designations.name' => 'ASC')));
-        // $this->set(compact('designations'));
     }
 
     /**
diff --git a/src/Controller/Reporter/AefisController.php b/src/Controller/Reporter/AefisController.php
index a0384b107..de5322bfa 100755
--- a/src/Controller/Reporter/AefisController.php
+++ b/src/Controller/Reporter/AefisController.php
@@ -14,7 +14,7 @@
  */
 class AefisController extends AppController
 {
-
+ 
     public $page_options = array('25' => '25', '50' => '50', '100' => '100');
     /**
      * Index method
diff --git a/src/Model/Table/AggregatesTable.php b/src/Model/Table/AggregatesTable.php
index 5a5c80a9e..2a920a60d 100755
--- a/src/Model/Table/AggregatesTable.php
+++ b/src/Model/Table/AggregatesTable.php
@@ -52,6 +52,9 @@ public function initialize(array $config): void
         $this->setPrimaryKey('id');
 
         $this->addBehavior('Timestamp');
+        $this->addBehavior('Search.Search');
+        $this->searchManager()
+            ->value('retention_status');
 
         $this->belongsTo('Users', [
             'foreignKey' => 'user_id',
diff --git a/src/Model/Table/DrugsTable.php b/src/Model/Table/DrugsTable.php
index b9fa8d9c7..c50cc86b0 100755
--- a/src/Model/Table/DrugsTable.php
+++ b/src/Model/Table/DrugsTable.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace App\Model\Table;
@@ -44,6 +45,16 @@ public function initialize(array $config): void
         $this->setPrimaryKey('id');
 
         $this->addBehavior('Timestamp');
+        $this->addBehavior('Search.Search');
+
+        $this->searchManager()
+            ->value('retention_status')
+            ->value('donation')
+            ->value('manufacturer')
+            ->value('brand_name')
+            ->value('batch_number')
+            ->value('registration_status')
+            ->value('inn_name');
     }
 
     /**
diff --git a/src/Model/Table/SaefisTable.php b/src/Model/Table/SaefisTable.php
index bb4234507..b46246cf5 100755
--- a/src/Model/Table/SaefisTable.php
+++ b/src/Model/Table/SaefisTable.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace App\Model\Table;
@@ -51,6 +52,9 @@ public function initialize(array $config): void
         $this->setPrimaryKey('id');
 
         $this->addBehavior('Timestamp');
+        $this->addBehavior('Search.Search');
+        $this->searchManager()
+            ->value('retention_status');
 
         $this->belongsTo('Users', [
             'foreignKey' => 'user_id',
diff --git a/templates/Manager/Aggregates/index.php b/templates/Manager/Aggregates/index.php
index 3ecdb8d76..6d8dc797c 100755
--- a/templates/Manager/Aggregates/index.php
+++ b/templates/Manager/Aggregates/index.php
@@ -1,154 +1,3 @@
 <?php
-/**
- * @var \App\View\AppView $this
- * @var iterable<\App\Model\Entity\Aggregate> $aggregates
- */
-?>
-<div class="aggregates index content">
-    <?= $this->Html->link(__('New Aggregate'), ['action' => 'add'], ['class' => 'button float-right']) ?>
-    <h3><?= __('Aggregates') ?></h3>
-    <div class="table-responsive">
-        <table>
-            <thead>
-                <tr>
-                    <th><?= $this->Paginator->sort('id') ?></th>
-                    <th><?= $this->Paginator->sort('user_id') ?></th>
-                    <th><?= $this->Paginator->sort('aggregate_id') ?></th>
-                    <th><?= $this->Paginator->sort('county_id') ?></th>
-                    <th><?= $this->Paginator->sort('summary_available') ?></th>
-                    <th><?= $this->Paginator->sort('sub_county_id') ?></th>
-                    <th><?= $this->Paginator->sort('designation_id') ?></th>
-                    <th><?= $this->Paginator->sort('reference_no') ?></th>
-                    <th><?= $this->Paginator->sort('messageid') ?></th>
-                    <th><?= $this->Paginator->sort('assigned_to') ?></th>
-                    <th><?= $this->Paginator->sort('assigned_by') ?></th>
-                    <th><?= $this->Paginator->sort('company_code') ?></th>
-                    <th><?= $this->Paginator->sort('company_name') ?></th>
-                    <th><?= $this->Paginator->sort('reporter_email') ?></th>
-                    <th><?= $this->Paginator->sort('e2b_type') ?></th>
-                    <th><?= $this->Paginator->sort('e2b_file') ?></th>
-                    <th><?= $this->Paginator->sort('dir') ?></th>
-                    <th><?= $this->Paginator->sort('size') ?></th>
-                    <th><?= $this->Paginator->sort('type') ?></th>
-                    <th><?= $this->Paginator->sort('assigned_date') ?></th>
-                    <th><?= $this->Paginator->sort('signature') ?></th>
-                    <th><?= $this->Paginator->sort('submitted') ?></th>
-                    <th><?= $this->Paginator->sort('submitted_date') ?></th>
-                    <th><?= $this->Paginator->sort('reporter_name') ?></th>
-                    <th><?= $this->Paginator->sort('reporter_designation') ?></th>
-                    <th><?= $this->Paginator->sort('reporter_phone') ?></th>
-                    <th><?= $this->Paginator->sort('reporter_date') ?></th>
-                    <th><?= $this->Paginator->sort('person_submitting') ?></th>
-                    <th><?= $this->Paginator->sort('reporter_name_diff') ?></th>
-                    <th><?= $this->Paginator->sort('reporter_designation_diff') ?></th>
-                    <th><?= $this->Paginator->sort('reporter_email_diff') ?></th>
-                    <th><?= $this->Paginator->sort('reporter_phone_diff') ?></th>
-                    <th><?= $this->Paginator->sort('reporter_date_diff') ?></th>
-                    <th><?= $this->Paginator->sort('resubmit') ?></th>
-                    <th><?= $this->Paginator->sort('status') ?></th>
-                    <th><?= $this->Paginator->sort('active') ?></th>
-                    <th><?= $this->Paginator->sort('copied') ?></th>
-                    <th><?= $this->Paginator->sort('archived') ?></th>
-                    <th><?= $this->Paginator->sort('archived_date') ?></th>
-                    <th><?= $this->Paginator->sort('created') ?></th>
-                    <th><?= $this->Paginator->sort('modified') ?></th>
-                    <th><?= $this->Paginator->sort('action_date') ?></th>
-                    <th><?= $this->Paginator->sort('deleted') ?></th>
-                    <th><?= $this->Paginator->sort('deleted_date') ?></th>
-                    <th><?= $this->Paginator->sort('brand_name') ?></th>
-                    <th><?= $this->Paginator->sort('inn_name') ?></th>
-                    <th><?= $this->Paginator->sort('mah') ?></th>
-                    <th><?= $this->Paginator->sort('local_technical') ?></th>
-                    <th><?= $this->Paginator->sort('therapeutic_group') ?></th>
-                    <th><?= $this->Paginator->sort('authorised_indications') ?></th>
-                    <th><?= $this->Paginator->sort('form_strength') ?></th>
-                    <th><?= $this->Paginator->sort('interval_code') ?></th>
-                    <th><?= $this->Paginator->sort('submission_frequency') ?></th>
-                    <th><?= $this->Paginator->sort('reminder_date') ?></th>
-                    <th><?= $this->Paginator->sort('report_type') ?></th>
-                    <th><?= $this->Paginator->sort('manager_initiated') ?></th>
-                    <th><?= $this->Paginator->sort('manager_submitted') ?></th>
-                    <th class="actions"><?= __('Actions') ?></th>
-                </tr>
-            </thead>
-            <tbody>
-                <?php foreach ($aggregates as $aggregate): ?>
-                <tr>
-                    <td><?= $this->Number->format($aggregate->id) ?></td>
-                    <td><?= $aggregate->has('user') ? $this->Html->link($aggregate->user->name, ['controller' => 'Users', 'action' => 'view', $aggregate->user->id]) : '' ?></td>
-                    <td><?= $aggregate->aggregate_id === null ? '' : $this->Number->format($aggregate->aggregate_id) ?></td>
-                    <td><?= $aggregate->has('county') ? $this->Html->link($aggregate->county->id, ['controller' => 'Counties', 'action' => 'view', $aggregate->county->id]) : '' ?></td>
-                    <td><?= h($aggregate->summary_available) ?></td>
-                    <td><?= $aggregate->has('sub_county') ? $this->Html->link($aggregate->sub_county->id, ['controller' => 'SubCounties', 'action' => 'view', $aggregate->sub_county->id]) : '' ?></td>
-                    <td><?= $aggregate->has('designation') ? $this->Html->link($aggregate->designation->name, ['controller' => 'Designations', 'action' => 'view', $aggregate->designation->id]) : '' ?></td>
-                    <td><?= h($aggregate->reference_no) ?></td>
-                    <td><?= h($aggregate->messageid) ?></td>
-                    <td><?= $aggregate->assigned_to === null ? '' : $this->Number->format($aggregate->assigned_to) ?></td>
-                    <td><?= $aggregate->assigned_by === null ? '' : $this->Number->format($aggregate->assigned_by) ?></td>
-                    <td><?= h($aggregate->company_code) ?></td>
-                    <td><?= h($aggregate->company_name) ?></td>
-                    <td><?= h($aggregate->reporter_email) ?></td>
-                    <td><?= h($aggregate->e2b_type) ?></td>
-                    <td><?= h($aggregate->e2b_file) ?></td>
-                    <td><?= h($aggregate->dir) ?></td>
-                    <td><?= h($aggregate->size) ?></td>
-                    <td><?= h($aggregate->type) ?></td>
-                    <td><?= h($aggregate->assigned_date) ?></td>
-                    <td><?= h($aggregate->signature) ?></td>
-                    <td><?= $aggregate->submitted === null ? '' : $this->Number->format($aggregate->submitted) ?></td>
-                    <td><?= h($aggregate->submitted_date) ?></td>
-                    <td><?= h($aggregate->reporter_name) ?></td>
-                    <td><?= $aggregate->reporter_designation === null ? '' : $this->Number->format($aggregate->reporter_designation) ?></td>
-                    <td><?= h($aggregate->reporter_phone) ?></td>
-                    <td><?= h($aggregate->reporter_date) ?></td>
-                    <td><?= h($aggregate->person_submitting) ?></td>
-                    <td><?= h($aggregate->reporter_name_diff) ?></td>
-                    <td><?= $aggregate->reporter_designation_diff === null ? '' : $this->Number->format($aggregate->reporter_designation_diff) ?></td>
-                    <td><?= h($aggregate->reporter_email_diff) ?></td>
-                    <td><?= h($aggregate->reporter_phone_diff) ?></td>
-                    <td><?= h($aggregate->reporter_date_diff) ?></td>
-                    <td><?= h($aggregate->resubmit) ?></td>
-                    <td><?= h($aggregate->status) ?></td>
-                    <td><?= $aggregate->active === null ? '' : $this->Number->format($aggregate->active) ?></td>
-                    <td><?= $aggregate->copied === null ? '' : $this->Number->format($aggregate->copied) ?></td>
-                    <td><?= $aggregate->archived === null ? '' : $this->Number->format($aggregate->archived) ?></td>
-                    <td><?= h($aggregate->archived_date) ?></td>
-                    <td><?= h($aggregate->created) ?></td>
-                    <td><?= h($aggregate->modified) ?></td>
-                    <td><?= h($aggregate->action_date) ?></td>
-                    <td><?= h($aggregate->deleted) ?></td>
-                    <td><?= h($aggregate->deleted_date) ?></td>
-                    <td><?= h($aggregate->brand_name) ?></td>
-                    <td><?= h($aggregate->inn_name) ?></td>
-                    <td><?= h($aggregate->mah) ?></td>
-                    <td><?= h($aggregate->local_technical) ?></td>
-                    <td><?= h($aggregate->therapeutic_group) ?></td>
-                    <td><?= h($aggregate->authorised_indications) ?></td>
-                    <td><?= h($aggregate->form_strength) ?></td>
-                    <td><?= $aggregate->interval_code === null ? '' : $this->Number->format($aggregate->interval_code) ?></td>
-                    <td><?= h($aggregate->submission_frequency) ?></td>
-                    <td><?= h($aggregate->reminder_date) ?></td>
-                    <td><?= h($aggregate->report_type) ?></td>
-                    <td><?= h($aggregate->manager_initiated) ?></td>
-                    <td><?= h($aggregate->manager_submitted) ?></td>
-                    <td class="actions">
-                        <?= $this->Html->link(__('View'), ['action' => 'view', $aggregate->id]) ?>
-                        <?= $this->Html->link(__('Edit'), ['action' => 'edit', $aggregate->id]) ?>
-                        <?= $this->Form->postLink(__('Delete'), ['action' => 'delete', $aggregate->id], ['confirm' => __('Are you sure you want to delete # {0}?', $aggregate->id)]) ?>
-                    </td>
-                </tr>
-                <?php endforeach; ?>
-            </tbody>
-        </table>
-    </div>
-    <div class="paginator">
-        <ul class="pagination">
-            <?= $this->Paginator->first('<< ' . __('first')) ?>
-            <?= $this->Paginator->prev('< ' . __('previous')) ?>
-            <?= $this->Paginator->numbers() ?>
-            <?= $this->Paginator->next(__('next') . ' >') ?>
-            <?= $this->Paginator->last(__('last') . ' >>') ?>
-        </ul>
-        <p><?= $this->Paginator->counter(__('Page {{page}} of {{pages}}, showing {{current}} record(s) out of {{count}} total')) ?></p>
-    </div>
-</div>
+$this->assign('AGGREGATE', 'active');
+echo $this->element('aggregates/aggregates_index');
diff --git a/templates/Manager/Ce2bs/index.php b/templates/Manager/Ce2bs/index.php
index f6607b2e2..61e3054dc 100755
--- a/templates/Manager/Ce2bs/index.php
+++ b/templates/Manager/Ce2bs/index.php
@@ -1,178 +1,6 @@
 <?php
-/**
- * @var \App\View\AppView $this
- * @var iterable<\App\Model\Entity\Ce2b> $ce2bs
- */
+    $this->assign('E2B', 'active');
+  echo $this->element('ce2b/ce2b_index');  
 ?>
-<div class="ce2bs index content">
-    <?= $this->Html->link(__('New Ce2b'), ['action' => 'add'], ['class' => 'button float-right']) ?>
-    <h3><?= __('Ce2bs') ?></h3>
-    <div class="table-responsive">
-        <table>
-            <thead>
-                <tr>
-                    <th><?= $this->Paginator->sort('id') ?></th>
-                    <th><?= $this->Paginator->sort('user_id') ?></th>
-                    <th><?= $this->Paginator->sort('ce2b_id') ?></th>
-                    <th><?= $this->Paginator->sort('vigiflow_message') ?></th>
-                    <th><?= $this->Paginator->sort('vigiflow_date') ?></th>
-                    <th><?= $this->Paginator->sort('report_type') ?></th>
-                    <th><?= $this->Paginator->sort('county_id') ?></th>
-                    <th><?= $this->Paginator->sort('sub_county_id') ?></th>
-                    <th><?= $this->Paginator->sort('designation_id') ?></th>
-                    <th><?= $this->Paginator->sort('reference_no') ?></th>
-                    <th><?= $this->Paginator->sort('messageid') ?></th>
-                    <th><?= $this->Paginator->sort('assigned_to') ?></th>
-                    <th><?= $this->Paginator->sort('assigned_by') ?></th>
-                    <th><?= $this->Paginator->sort('company_code') ?></th>
-                    <th><?= $this->Paginator->sort('company_name') ?></th>
-                    <th><?= $this->Paginator->sort('reporter_email') ?></th>
-                    <th><?= $this->Paginator->sort('e2b_type') ?></th>
-                    <th><?= $this->Paginator->sort('e2b_file') ?></th>
-                    <th><?= $this->Paginator->sort('dir') ?></th>
-                    <th><?= $this->Paginator->sort('size') ?></th>
-                    <th><?= $this->Paginator->sort('type') ?></th>
-                    <th><?= $this->Paginator->sort('assigned_date') ?></th>
-                    <th><?= $this->Paginator->sort('signature') ?></th>
-                    <th><?= $this->Paginator->sort('submitted') ?></th>
-                    <th><?= $this->Paginator->sort('submitted_date') ?></th>
-                    <th><?= $this->Paginator->sort('reporter_name') ?></th>
-                    <th><?= $this->Paginator->sort('reporter_designation') ?></th>
-                    <th><?= $this->Paginator->sort('reporter_phone') ?></th>
-                    <th><?= $this->Paginator->sort('reporter_date') ?></th>
-                    <th><?= $this->Paginator->sort('person_submitting') ?></th>
-                    <th><?= $this->Paginator->sort('reporter_name_diff') ?></th>
-                    <th><?= $this->Paginator->sort('reporter_designation_diff') ?></th>
-                    <th><?= $this->Paginator->sort('reporter_email_diff') ?></th>
-                    <th><?= $this->Paginator->sort('reporter_phone_diff') ?></th>
-                    <th><?= $this->Paginator->sort('reporter_date_diff') ?></th>
-                    <th><?= $this->Paginator->sort('resubmit') ?></th>
-                    <th><?= $this->Paginator->sort('status') ?></th>
-                    <th><?= $this->Paginator->sort('active') ?></th>
-                    <th><?= $this->Paginator->sort('copied') ?></th>
-                    <th><?= $this->Paginator->sort('archived') ?></th>
-                    <th><?= $this->Paginator->sort('archived_date') ?></th>
-                    <th><?= $this->Paginator->sort('created') ?></th>
-                    <th><?= $this->Paginator->sort('modified') ?></th>
-                    <th><?= $this->Paginator->sort('action_date') ?></th>
-                    <th><?= $this->Paginator->sort('deleted') ?></th>
-                    <th><?= $this->Paginator->sort('deleted_date') ?></th>
-                    <th><?= $this->Paginator->sort('report_reference') ?></th>
-                    <th><?= $this->Paginator->sort('creation_time') ?></th>
-                    <th><?= $this->Paginator->sort('sender_reference') ?></th>
-                    <th><?= $this->Paginator->sort('receiver_id') ?></th>
-                    <th><?= $this->Paginator->sort('sender_id') ?></th>
-                    <th><?= $this->Paginator->sort('sender_unique_identifier') ?></th>
-                    <th><?= $this->Paginator->sort('worldwide_identifier') ?></th>
-                    <th><?= $this->Paginator->sort('date_first_received') ?></th>
-                    <th><?= $this->Paginator->sort('date_most_recent_info') ?></th>
-                    <th><?= $this->Paginator->sort('serious') ?></th>
-                    <th><?= $this->Paginator->sort('patient_name') ?></th>
-                    <th><?= $this->Paginator->sort('patient_sex') ?></th>
-                    <th><?= $this->Paginator->sort('patient_dob') ?></th>
-                    <th><?= $this->Paginator->sort('patient_number') ?></th>
-                    <th><?= $this->Paginator->sort('sender_address') ?></th>
-                    <th><?= $this->Paginator->sort('sender_city') ?></th>
-                    <th><?= $this->Paginator->sort('sender_state') ?></th>
-                    <th><?= $this->Paginator->sort('sender_department') ?></th>
-                    <th><?= $this->Paginator->sort('sender_organization') ?></th>
-                    <th><?= $this->Paginator->sort('results_in_detah') ?></th>
-                    <th><?= $this->Paginator->sort('life_threatening') ?></th>
-                    <th><?= $this->Paginator->sort('prolonged_hospitalization') ?></th>
-                    <th><?= $this->Paginator->sort('incapacitating') ?></th>
-                    <th class="actions"><?= __('Actions') ?></th>
-                </tr>
-            </thead>
-            <tbody>
-                <?php foreach ($ce2bs as $ce2b): ?>
-                <tr>
-                    <td><?= $this->Number->format($ce2b->id) ?></td>
-                    <td><?= $ce2b->has('user') ? $this->Html->link($ce2b->user->name, ['controller' => 'Users', 'action' => 'view', $ce2b->user->id]) : '' ?></td>
-                    <td><?= $ce2b->ce2b_id === null ? '' : $this->Number->format($ce2b->ce2b_id) ?></td>
-                    <td><?= h($ce2b->vigiflow_message) ?></td>
-                    <td><?= h($ce2b->vigiflow_date) ?></td>
-                    <td><?= h($ce2b->report_type) ?></td>
-                    <td><?= $ce2b->has('county') ? $this->Html->link($ce2b->county->id, ['controller' => 'Counties', 'action' => 'view', $ce2b->county->id]) : '' ?></td>
-                    <td><?= $ce2b->has('sub_county') ? $this->Html->link($ce2b->sub_county->id, ['controller' => 'SubCounties', 'action' => 'view', $ce2b->sub_county->id]) : '' ?></td>
-                    <td><?= $ce2b->has('designation') ? $this->Html->link($ce2b->designation->name, ['controller' => 'Designations', 'action' => 'view', $ce2b->designation->id]) : '' ?></td>
-                    <td><?= h($ce2b->reference_no) ?></td>
-                    <td><?= h($ce2b->messageid) ?></td>
-                    <td><?= $ce2b->assigned_to === null ? '' : $this->Number->format($ce2b->assigned_to) ?></td>
-                    <td><?= $ce2b->assigned_by === null ? '' : $this->Number->format($ce2b->assigned_by) ?></td>
-                    <td><?= h($ce2b->company_code) ?></td>
-                    <td><?= h($ce2b->company_name) ?></td>
-                    <td><?= h($ce2b->reporter_email) ?></td>
-                    <td><?= h($ce2b->e2b_type) ?></td>
-                    <td><?= h($ce2b->e2b_file) ?></td>
-                    <td><?= h($ce2b->dir) ?></td>
-                    <td><?= h($ce2b->size) ?></td>
-                    <td><?= h($ce2b->type) ?></td>
-                    <td><?= h($ce2b->assigned_date) ?></td>
-                    <td><?= h($ce2b->signature) ?></td>
-                    <td><?= $ce2b->submitted === null ? '' : $this->Number->format($ce2b->submitted) ?></td>
-                    <td><?= h($ce2b->submitted_date) ?></td>
-                    <td><?= h($ce2b->reporter_name) ?></td>
-                    <td><?= $ce2b->reporter_designation === null ? '' : $this->Number->format($ce2b->reporter_designation) ?></td>
-                    <td><?= h($ce2b->reporter_phone) ?></td>
-                    <td><?= h($ce2b->reporter_date) ?></td>
-                    <td><?= h($ce2b->person_submitting) ?></td>
-                    <td><?= h($ce2b->reporter_name_diff) ?></td>
-                    <td><?= $ce2b->reporter_designation_diff === null ? '' : $this->Number->format($ce2b->reporter_designation_diff) ?></td>
-                    <td><?= h($ce2b->reporter_email_diff) ?></td>
-                    <td><?= h($ce2b->reporter_phone_diff) ?></td>
-                    <td><?= h($ce2b->reporter_date_diff) ?></td>
-                    <td><?= h($ce2b->resubmit) ?></td>
-                    <td><?= h($ce2b->status) ?></td>
-                    <td><?= $ce2b->active === null ? '' : $this->Number->format($ce2b->active) ?></td>
-                    <td><?= $ce2b->copied === null ? '' : $this->Number->format($ce2b->copied) ?></td>
-                    <td><?= $ce2b->archived === null ? '' : $this->Number->format($ce2b->archived) ?></td>
-                    <td><?= h($ce2b->archived_date) ?></td>
-                    <td><?= h($ce2b->created) ?></td>
-                    <td><?= h($ce2b->modified) ?></td>
-                    <td><?= h($ce2b->action_date) ?></td>
-                    <td><?= h($ce2b->deleted) ?></td>
-                    <td><?= h($ce2b->deleted_date) ?></td>
-                    <td><?= h($ce2b->report_reference) ?></td>
-                    <td><?= h($ce2b->creation_time) ?></td>
-                    <td><?= h($ce2b->sender_reference) ?></td>
-                    <td><?= h($ce2b->receiver_id) ?></td>
-                    <td><?= h($ce2b->sender_id) ?></td>
-                    <td><?= h($ce2b->sender_unique_identifier) ?></td>
-                    <td><?= h($ce2b->worldwide_identifier) ?></td>
-                    <td><?= h($ce2b->date_first_received) ?></td>
-                    <td><?= h($ce2b->date_most_recent_info) ?></td>
-                    <td><?= h($ce2b->serious) ?></td>
-                    <td><?= h($ce2b->patient_name) ?></td>
-                    <td><?= h($ce2b->patient_sex) ?></td>
-                    <td><?= h($ce2b->patient_dob) ?></td>
-                    <td><?= h($ce2b->patient_number) ?></td>
-                    <td><?= h($ce2b->sender_address) ?></td>
-                    <td><?= h($ce2b->sender_city) ?></td>
-                    <td><?= h($ce2b->sender_state) ?></td>
-                    <td><?= h($ce2b->sender_department) ?></td>
-                    <td><?= h($ce2b->sender_organization) ?></td>
-                    <td><?= h($ce2b->results_in_detah) ?></td>
-                    <td><?= h($ce2b->life_threatening) ?></td>
-                    <td><?= h($ce2b->prolonged_hospitalization) ?></td>
-                    <td><?= h($ce2b->incapacitating) ?></td>
-                    <td class="actions">
-                        <?= $this->Html->link(__('View'), ['action' => 'view', $ce2b->id]) ?>
-                        <?= $this->Html->link(__('Edit'), ['action' => 'edit', $ce2b->id]) ?>
-                        <?= $this->Form->postLink(__('Delete'), ['action' => 'delete', $ce2b->id], ['confirm' => __('Are you sure you want to delete # {0}?', $ce2b->id)]) ?>
-                    </td>
-                </tr>
-                <?php endforeach; ?>
-            </tbody>
-        </table>
-    </div>
-    <div class="paginator">
-        <ul class="pagination">
-            <?= $this->Paginator->first('<< ' . __('first')) ?>
-            <?= $this->Paginator->prev('< ' . __('previous')) ?>
-            <?= $this->Paginator->numbers() ?>
-            <?= $this->Paginator->next(__('next') . ' >') ?>
-            <?= $this->Paginator->last(__('last') . ' >>') ?>
-        </ul>
-        <p><?= $this->Paginator->counter(__('Page {{page}} of {{pages}}, showing {{current}} record(s) out of {{count}} total')) ?></p>
-    </div>
-</div>
+
+
diff --git a/templates/Manager/Saefis/index.php b/templates/Manager/Saefis/index.php
index 0394f808b..4f4d5c69a 100755
--- a/templates/Manager/Saefis/index.php
+++ b/templates/Manager/Saefis/index.php
@@ -1,344 +1,7 @@
 <?php
-/**
- * @var \App\View\AppView $this
- * @var iterable<\App\Model\Entity\Saefi> $saefis
- */
+   $this->assign('Serious Adverse Event Following Immunization', 'active');
 ?>
-<div class="saefis index content">
-    <?= $this->Html->link(__('New Saefi'), ['action' => 'add'], ['class' => 'button float-right']) ?>
-    <h3><?= __('Saefis') ?></h3>
-    <div class="table-responsive">
-        <table>
-            <thead>
-                <tr>
-                    <th><?= $this->Paginator->sort('id') ?></th>
-                    <th><?= $this->Paginator->sort('user_id') ?></th>
-                    <th><?= $this->Paginator->sort('saefi_id') ?></th>
-                    <th><?= $this->Paginator->sort('initial_id') ?></th>
-                    <th><?= $this->Paginator->sort('messageid') ?></th>
-                    <th><?= $this->Paginator->sort('vigiflow_ref') ?></th>
-                    <th><?= $this->Paginator->sort('vigiflow_date') ?></th>
-                    <th><?= $this->Paginator->sort('webradr_ref') ?></th>
-                    <th><?= $this->Paginator->sort('webradr_date') ?></th>
-                    <th><?= $this->Paginator->sort('province_id') ?></th>
-                    <th><?= $this->Paginator->sort('district') ?></th>
-                    <th><?= $this->Paginator->sort('aefi_report_ref') ?></th>
-                    <th><?= $this->Paginator->sort('name_of_vaccination_site') ?></th>
-                    <th><?= $this->Paginator->sort('reference_no') ?></th>
-                    <th><?= $this->Paginator->sort('assigned_to') ?></th>
-                    <th><?= $this->Paginator->sort('assigned_by') ?></th>
-                    <th><?= $this->Paginator->sort('assigned_date') ?></th>
-                    <th><?= $this->Paginator->sort('place_vaccination') ?></th>
-                    <th><?= $this->Paginator->sort('place_vaccination_other') ?></th>
-                    <th><?= $this->Paginator->sort('site_type') ?></th>
-                    <th><?= $this->Paginator->sort('site_type_other') ?></th>
-                    <th><?= $this->Paginator->sort('vaccination_in') ?></th>
-                    <th><?= $this->Paginator->sort('vaccination_in_other') ?></th>
-                    <th><?= $this->Paginator->sort('reporter_name') ?></th>
-                    <th><?= $this->Paginator->sort('report_date') ?></th>
-                    <th><?= $this->Paginator->sort('start_date') ?></th>
-                    <th><?= $this->Paginator->sort('complete_date') ?></th>
-                    <th><?= $this->Paginator->sort('designation_id') ?></th>
-                    <th><?= $this->Paginator->sort('telephone') ?></th>
-                    <th><?= $this->Paginator->sort('mobile') ?></th>
-                    <th><?= $this->Paginator->sort('reporter_email') ?></th>
-                    <th><?= $this->Paginator->sort('patient_name') ?></th>
-                    <th><?= $this->Paginator->sort('gender') ?></th>
-                    <th><?= $this->Paginator->sort('patient_address') ?></th>
-                    <th><?= $this->Paginator->sort('date_of_birth') ?></th>
-                    <th><?= $this->Paginator->sort('age_at_onset_years') ?></th>
-                    <th><?= $this->Paginator->sort('age_at_onset_months') ?></th>
-                    <th><?= $this->Paginator->sort('age_at_onset_days') ?></th>
-                    <th><?= $this->Paginator->sort('age_group') ?></th>
-                    <th><?= $this->Paginator->sort('symptom_date') ?></th>
-                    <th><?= $this->Paginator->sort('hospitalization_date') ?></th>
-                    <th><?= $this->Paginator->sort('status_on_date') ?></th>
-                    <th><?= $this->Paginator->sort('died_date') ?></th>
-                    <th><?= $this->Paginator->sort('autopsy_done') ?></th>
-                    <th><?= $this->Paginator->sort('autopsy_done_date') ?></th>
-                    <th><?= $this->Paginator->sort('autopsy_planned') ?></th>
-                    <th><?= $this->Paginator->sort('autopsy_planned_date') ?></th>
-                    <th><?= $this->Paginator->sort('past_history') ?></th>
-                    <th><?= $this->Paginator->sort('adverse_event') ?></th>
-                    <th><?= $this->Paginator->sort('allergy_history') ?></th>
-                    <th><?= $this->Paginator->sort('comorbidity_disorder') ?></th>
-                    <th><?= $this->Paginator->sort('covid_positive') ?></th>
-                    <th><?= $this->Paginator->sort('existing_illness') ?></th>
-                    <th><?= $this->Paginator->sort('hospitalization_history') ?></th>
-                    <th><?= $this->Paginator->sort('medication_vaccination') ?></th>
-                    <th><?= $this->Paginator->sort('faith_healers') ?></th>
-                    <th><?= $this->Paginator->sort('family_history') ?></th>
-                    <th><?= $this->Paginator->sort('pregnant') ?></th>
-                    <th><?= $this->Paginator->sort('pregnant_weeks') ?></th>
-                    <th><?= $this->Paginator->sort('breastfeeding') ?></th>
-                    <th><?= $this->Paginator->sort('infant') ?></th>
-                    <th><?= $this->Paginator->sort('birth_weight') ?></th>
-                    <th><?= $this->Paginator->sort('delivery_procedure') ?></th>
-                    <th><?= $this->Paginator->sort('source_examination') ?></th>
-                    <th><?= $this->Paginator->sort('source_documents') ?></th>
-                    <th><?= $this->Paginator->sort('source_verbal') ?></th>
-                    <th><?= $this->Paginator->sort('source_other') ?></th>
-                    <th><?= $this->Paginator->sort('examiner_name') ?></th>
-                    <th><?= $this->Paginator->sort('person_details') ?></th>
-                    <th><?= $this->Paginator->sort('person_designation') ?></th>
-                    <th><?= $this->Paginator->sort('person_date') ?></th>
-                    <th><?= $this->Paginator->sort('when_vaccinated') ?></th>
-                    <th><?= $this->Paginator->sort('vaccine_given') ?></th>
-                    <th><?= $this->Paginator->sort('prescribing_error') ?></th>
-                    <th><?= $this->Paginator->sort('vaccine_unsterile') ?></th>
-                    <th><?= $this->Paginator->sort('vaccine_condition') ?></th>
-                    <th><?= $this->Paginator->sort('vaccine_reconstitution') ?></th>
-                    <th><?= $this->Paginator->sort('vaccine_handling') ?></th>
-                    <th><?= $this->Paginator->sort('vaccine_administered') ?></th>
-                    <th><?= $this->Paginator->sort('vaccinated_vial') ?></th>
-                    <th><?= $this->Paginator->sort('vaccinated_session') ?></th>
-                    <th><?= $this->Paginator->sort('vaccinated_locations') ?></th>
-                    <th><?= $this->Paginator->sort('vaccinated_cluster') ?></th>
-                    <th><?= $this->Paginator->sort('vaccinated_cluster_number') ?></th>
-                    <th><?= $this->Paginator->sort('vaccinated_cluster_vial') ?></th>
-                    <th><?= $this->Paginator->sort('vaccinated_cluster_vial_number') ?></th>
-                    <th><?= $this->Paginator->sort('syringes_used') ?></th>
-                    <th><?= $this->Paginator->sort('syringes_used_specify') ?></th>
-                    <th><?= $this->Paginator->sort('syringes_used_other') ?></th>
-                    <th><?= $this->Paginator->sort('injection_dose_route') ?></th>
-                    <th><?= $this->Paginator->sort('injection_time_mentioned') ?></th>
-                    <th><?= $this->Paginator->sort('injection_no_touch') ?></th>
-                    <th><?= $this->Paginator->sort('injection_contraindications') ?></th>
-                    <th><?= $this->Paginator->sort('injection_reported') ?></th>
-                    <th><?= $this->Paginator->sort('injection_vaccines') ?></th>
-                    <th><?= $this->Paginator->sort('injection_vaccines_yes') ?></th>
-                    <th><?= $this->Paginator->sort('reconstitution_multiple') ?></th>
-                    <th><?= $this->Paginator->sort('reconstitution_different') ?></th>
-                    <th><?= $this->Paginator->sort('reconstitution_vial') ?></th>
-                    <th><?= $this->Paginator->sort('reconstitution_syringe') ?></th>
-                    <th><?= $this->Paginator->sort('reconstitution_vaccines') ?></th>
-                    <th><?= $this->Paginator->sort('cold_temperature') ?></th>
-                    <th><?= $this->Paginator->sort('cold_temperature_deviation') ?></th>
-                    <th><?= $this->Paginator->sort('procedure_followed') ?></th>
-                    <th><?= $this->Paginator->sort('other_items') ?></th>
-                    <th><?= $this->Paginator->sort('partial_vaccines') ?></th>
-                    <th><?= $this->Paginator->sort('unusable_vaccines') ?></th>
-                    <th><?= $this->Paginator->sort('unusable_diluents') ?></th>
-                    <th><?= $this->Paginator->sort('cold_transportation') ?></th>
-                    <th><?= $this->Paginator->sort('vaccine_carrier') ?></th>
-                    <th><?= $this->Paginator->sort('coolant_packs') ?></th>
-                    <th><?= $this->Paginator->sort('similar_events') ?></th>
-                    <th><?= $this->Paginator->sort('similar_events_episodes') ?></th>
-                    <th><?= $this->Paginator->sort('affected_vaccinated') ?></th>
-                    <th><?= $this->Paginator->sort('affected_not_vaccinated') ?></th>
-                    <th><?= $this->Paginator->sort('affected_unknown') ?></th>
-                    <th><?= $this->Paginator->sort('created') ?></th>
-                    <th><?= $this->Paginator->sort('modified') ?></th>
-                    <th><?= $this->Paginator->sort('action_date') ?></th>
-                    <th><?= $this->Paginator->sort('submitted') ?></th>
-                    <th><?= $this->Paginator->sort('resubmit') ?></th>
-                    <th><?= $this->Paginator->sort('submitted_date') ?></th>
-                    <th><?= $this->Paginator->sort('report_type') ?></th>
-                    <th><?= $this->Paginator->sort('status') ?></th>
-                    <th><?= $this->Paginator->sort('active') ?></th>
-                    <th><?= $this->Paginator->sort('emails') ?></th>
-                    <th><?= $this->Paginator->sort('signature') ?></th>
-                    <th><?= $this->Paginator->sort('deleted') ?></th>
-                    <th><?= $this->Paginator->sort('copied') ?></th>
-                    <th><?= $this->Paginator->sort('archived') ?></th>
-                    <th><?= $this->Paginator->sort('archived_date') ?></th>
-                    <th><?= $this->Paginator->sort('reporter_phone') ?></th>
-                    <th><?= $this->Paginator->sort('reporter_date') ?></th>
-                    <th><?= $this->Paginator->sort('person_submitting') ?></th>
-                    <th><?= $this->Paginator->sort('reporter_name_diff') ?></th>
-                    <th><?= $this->Paginator->sort('reporter_designation_diff') ?></th>
-                    <th><?= $this->Paginator->sort('reporter_email_diff') ?></th>
-                    <th><?= $this->Paginator->sort('reporter_phone_diff') ?></th>
-                    <th><?= $this->Paginator->sort('reporter_date_diff') ?></th>
-                    <th><?= $this->Paginator->sort('patient_phone') ?></th>
-                    <th><?= $this->Paginator->sort('patient_street_name') ?></th>
-                    <th><?= $this->Paginator->sort('syringes_used_other_specify') ?></th>
-                    <th><?= $this->Paginator->sort('vaccinator_training') ?></th>
-                    <th><?= $this->Paginator->sort('description_of_reaction') ?></th>
-                    <th><?= $this->Paginator->sort('name_of_person_first_treated') ?></th>
-                    <th><?= $this->Paginator->sort('name_of_the_person_treating') ?></th>
-                    <th><?= $this->Paginator->sort('other_source_of_info') ?></th>
-                    <th><?= $this->Paginator->sort('patient_house_number') ?></th>
-                    <th><?= $this->Paginator->sort('time_of_first_symptom') ?></th>
-                    <th><?= $this->Paginator->sort('vaccine_name') ?></th>
-                    <th><?= $this->Paginator->sort('date_first_reported') ?></th>
-                    <th><?= $this->Paginator->sort('date_form_filled') ?></th>
-                    <th class="actions"><?= __('Actions') ?></th>
-                </tr>
-            </thead>
-            <tbody>
-                <?php foreach ($saefis as $saefi): ?>
-                <tr>
-                    <td><?= $this->Number->format($saefi->id) ?></td>
-                    <td><?= $saefi->has('user') ? $this->Html->link($saefi->user->name, ['controller' => 'Users', 'action' => 'view', $saefi->user->id]) : '' ?></td>
-                    <td><?= $saefi->saefi_id === null ? '' : $this->Number->format($saefi->saefi_id) ?></td>
-                    <td><?= $saefi->initial_id === null ? '' : $this->Number->format($saefi->initial_id) ?></td>
-                    <td><?= h($saefi->messageid) ?></td>
-                    <td><?= h($saefi->vigiflow_ref) ?></td>
-                    <td><?= h($saefi->vigiflow_date) ?></td>
-                    <td><?= h($saefi->webradr_ref) ?></td>
-                    <td><?= h($saefi->webradr_date) ?></td>
-                    <td><?= $saefi->province_id === null ? '' : $this->Number->format($saefi->province_id) ?></td>
-                    <td><?= h($saefi->district) ?></td>
-                    <td><?= h($saefi->aefi_report_ref) ?></td>
-                    <td><?= h($saefi->name_of_vaccination_site) ?></td>
-                    <td><?= h($saefi->reference_no) ?></td>
-                    <td><?= $saefi->assigned_to === null ? '' : $this->Number->format($saefi->assigned_to) ?></td>
-                    <td><?= $saefi->assigned_by === null ? '' : $this->Number->format($saefi->assigned_by) ?></td>
-                    <td><?= h($saefi->assigned_date) ?></td>
-                    <td><?= h($saefi->place_vaccination) ?></td>
-                    <td><?= h($saefi->place_vaccination_other) ?></td>
-                    <td><?= h($saefi->site_type) ?></td>
-                    <td><?= h($saefi->site_type_other) ?></td>
-                    <td><?= h($saefi->vaccination_in) ?></td>
-                    <td><?= h($saefi->vaccination_in_other) ?></td>
-                    <td><?= h($saefi->reporter_name) ?></td>
-                    <td><?= h($saefi->report_date) ?></td>
-                    <td><?= h($saefi->start_date) ?></td>
-                    <td><?= h($saefi->complete_date) ?></td>
-                    <td><?= $saefi->has('designation') ? $this->Html->link($saefi->designation->name, ['controller' => 'Designations', 'action' => 'view', $saefi->designation->id]) : '' ?></td>
-                    <td><?= h($saefi->telephone) ?></td>
-                    <td><?= h($saefi->mobile) ?></td>
-                    <td><?= h($saefi->reporter_email) ?></td>
-                    <td><?= h($saefi->patient_name) ?></td>
-                    <td><?= h($saefi->gender) ?></td>
-                    <td><?= h($saefi->patient_address) ?></td>
-                    <td><?= h($saefi->date_of_birth) ?></td>
-                    <td><?= $saefi->age_at_onset_years === null ? '' : $this->Number->format($saefi->age_at_onset_years) ?></td>
-                    <td><?= $saefi->age_at_onset_months === null ? '' : $this->Number->format($saefi->age_at_onset_months) ?></td>
-                    <td><?= $saefi->age_at_onset_days === null ? '' : $this->Number->format($saefi->age_at_onset_days) ?></td>
-                    <td><?= h($saefi->age_group) ?></td>
-                    <td><?= h($saefi->symptom_date) ?></td>
-                    <td><?= h($saefi->hospitalization_date) ?></td>
-                    <td><?= h($saefi->status_on_date) ?></td>
-                    <td><?= h($saefi->died_date) ?></td>
-                    <td><?= h($saefi->autopsy_done) ?></td>
-                    <td><?= h($saefi->autopsy_done_date) ?></td>
-                    <td><?= h($saefi->autopsy_planned) ?></td>
-                    <td><?= h($saefi->autopsy_planned_date) ?></td>
-                    <td><?= h($saefi->past_history) ?></td>
-                    <td><?= h($saefi->adverse_event) ?></td>
-                    <td><?= h($saefi->allergy_history) ?></td>
-                    <td><?= h($saefi->comorbidity_disorder) ?></td>
-                    <td><?= h($saefi->covid_positive) ?></td>
-                    <td><?= h($saefi->existing_illness) ?></td>
-                    <td><?= h($saefi->hospitalization_history) ?></td>
-                    <td><?= h($saefi->medication_vaccination) ?></td>
-                    <td><?= h($saefi->faith_healers) ?></td>
-                    <td><?= h($saefi->family_history) ?></td>
-                    <td><?= h($saefi->pregnant) ?></td>
-                    <td><?= h($saefi->pregnant_weeks) ?></td>
-                    <td><?= h($saefi->breastfeeding) ?></td>
-                    <td><?= h($saefi->infant) ?></td>
-                    <td><?= $saefi->birth_weight === null ? '' : $this->Number->format($saefi->birth_weight) ?></td>
-                    <td><?= h($saefi->delivery_procedure) ?></td>
-                    <td><?= h($saefi->source_examination) ?></td>
-                    <td><?= h($saefi->source_documents) ?></td>
-                    <td><?= h($saefi->source_verbal) ?></td>
-                    <td><?= h($saefi->source_other) ?></td>
-                    <td><?= h($saefi->examiner_name) ?></td>
-                    <td><?= h($saefi->person_details) ?></td>
-                    <td><?= h($saefi->person_designation) ?></td>
-                    <td><?= h($saefi->person_date) ?></td>
-                    <td><?= h($saefi->when_vaccinated) ?></td>
-                    <td><?= h($saefi->vaccine_given) ?></td>
-                    <td><?= h($saefi->prescribing_error) ?></td>
-                    <td><?= h($saefi->vaccine_unsterile) ?></td>
-                    <td><?= h($saefi->vaccine_condition) ?></td>
-                    <td><?= h($saefi->vaccine_reconstitution) ?></td>
-                    <td><?= h($saefi->vaccine_handling) ?></td>
-                    <td><?= h($saefi->vaccine_administered) ?></td>
-                    <td><?= $saefi->vaccinated_vial === null ? '' : $this->Number->format($saefi->vaccinated_vial) ?></td>
-                    <td><?= $saefi->vaccinated_session === null ? '' : $this->Number->format($saefi->vaccinated_session) ?></td>
-                    <td><?= $saefi->vaccinated_locations === null ? '' : $this->Number->format($saefi->vaccinated_locations) ?></td>
-                    <td><?= h($saefi->vaccinated_cluster) ?></td>
-                    <td><?= $saefi->vaccinated_cluster_number === null ? '' : $this->Number->format($saefi->vaccinated_cluster_number) ?></td>
-                    <td><?= h($saefi->vaccinated_cluster_vial) ?></td>
-                    <td><?= $saefi->vaccinated_cluster_vial_number === null ? '' : $this->Number->format($saefi->vaccinated_cluster_vial_number) ?></td>
-                    <td><?= h($saefi->syringes_used) ?></td>
-                    <td><?= h($saefi->syringes_used_specify) ?></td>
-                    <td><?= h($saefi->syringes_used_other) ?></td>
-                    <td><?= h($saefi->injection_dose_route) ?></td>
-                    <td><?= h($saefi->injection_time_mentioned) ?></td>
-                    <td><?= h($saefi->injection_no_touch) ?></td>
-                    <td><?= h($saefi->injection_contraindications) ?></td>
-                    <td><?= h($saefi->injection_reported) ?></td>
-                    <td><?= h($saefi->injection_vaccines) ?></td>
-                    <td><?= h($saefi->injection_vaccines_yes) ?></td>
-                    <td><?= h($saefi->reconstitution_multiple) ?></td>
-                    <td><?= h($saefi->reconstitution_different) ?></td>
-                    <td><?= h($saefi->reconstitution_vial) ?></td>
-                    <td><?= h($saefi->reconstitution_syringe) ?></td>
-                    <td><?= h($saefi->reconstitution_vaccines) ?></td>
-                    <td><?= h($saefi->cold_temperature) ?></td>
-                    <td><?= h($saefi->cold_temperature_deviation) ?></td>
-                    <td><?= h($saefi->procedure_followed) ?></td>
-                    <td><?= h($saefi->other_items) ?></td>
-                    <td><?= h($saefi->partial_vaccines) ?></td>
-                    <td><?= h($saefi->unusable_vaccines) ?></td>
-                    <td><?= h($saefi->unusable_diluents) ?></td>
-                    <td><?= h($saefi->cold_transportation) ?></td>
-                    <td><?= h($saefi->vaccine_carrier) ?></td>
-                    <td><?= h($saefi->coolant_packs) ?></td>
-                    <td><?= h($saefi->similar_events) ?></td>
-                    <td><?= $saefi->similar_events_episodes === null ? '' : $this->Number->format($saefi->similar_events_episodes) ?></td>
-                    <td><?= $saefi->affected_vaccinated === null ? '' : $this->Number->format($saefi->affected_vaccinated) ?></td>
-                    <td><?= $saefi->affected_not_vaccinated === null ? '' : $this->Number->format($saefi->affected_not_vaccinated) ?></td>
-                    <td><?= h($saefi->affected_unknown) ?></td>
-                    <td><?= h($saefi->created) ?></td>
-                    <td><?= h($saefi->modified) ?></td>
-                    <td><?= h($saefi->action_date) ?></td>
-                    <td><?= $this->Number->format($saefi->submitted) ?></td>
-                    <td><?= h($saefi->resubmit) ?></td>
-                    <td><?= h($saefi->submitted_date) ?></td>
-                    <td><?= h($saefi->report_type) ?></td>
-                    <td><?= h($saefi->status) ?></td>
-                    <td><?= $saefi->active === null ? '' : $this->Number->format($saefi->active) ?></td>
-                    <td><?= $saefi->emails === null ? '' : $this->Number->format($saefi->emails) ?></td>
-                    <td><?= h($saefi->signature) ?></td>
-                    <td><?= $saefi->deleted === null ? '' : $this->Number->format($saefi->deleted) ?></td>
-                    <td><?= $saefi->copied === null ? '' : $this->Number->format($saefi->copied) ?></td>
-                    <td><?= $saefi->archived === null ? '' : $this->Number->format($saefi->archived) ?></td>
-                    <td><?= h($saefi->archived_date) ?></td>
-                    <td><?= h($saefi->reporter_phone) ?></td>
-                    <td><?= h($saefi->reporter_date) ?></td>
-                    <td><?= h($saefi->person_submitting) ?></td>
-                    <td><?= h($saefi->reporter_name_diff) ?></td>
-                    <td><?= h($saefi->reporter_designation_diff) ?></td>
-                    <td><?= h($saefi->reporter_email_diff) ?></td>
-                    <td><?= h($saefi->reporter_phone_diff) ?></td>
-                    <td><?= h($saefi->reporter_date_diff) ?></td>
-                    <td><?= h($saefi->patient_phone) ?></td>
-                    <td><?= h($saefi->patient_street_name) ?></td>
-                    <td><?= h($saefi->syringes_used_other_specify) ?></td>
-                    <td><?= h($saefi->vaccinator_training) ?></td>
-                    <td><?= h($saefi->description_of_reaction) ?></td>
-                    <td><?= h($saefi->name_of_person_first_treated) ?></td>
-                    <td><?= h($saefi->name_of_the_person_treating) ?></td>
-                    <td><?= h($saefi->other_source_of_info) ?></td>
-                    <td><?= h($saefi->patient_house_number) ?></td>
-                    <td><?= h($saefi->time_of_first_symptom) ?></td>
-                    <td><?= h($saefi->vaccine_name) ?></td>
-                    <td><?= h($saefi->date_first_reported) ?></td>
-                    <td><?= h($saefi->date_form_filled) ?></td>
-                    <td class="actions">
-                        <?= $this->Html->link(__('View'), ['action' => 'view', $saefi->id]) ?>
-                        <?= $this->Html->link(__('Edit'), ['action' => 'edit', $saefi->id]) ?>
-                        <?= $this->Form->postLink(__('Delete'), ['action' => 'delete', $saefi->id], ['confirm' => __('Are you sure you want to delete # {0}?', $saefi->id)]) ?>
-                    </td>
-                </tr>
-                <?php endforeach; ?>
-            </tbody>
-        </table>
-    </div>
-    <div class="paginator">
-        <ul class="pagination">
-            <?= $this->Paginator->first('<< ' . __('first')) ?>
-            <?= $this->Paginator->prev('< ' . __('previous')) ?>
-            <?= $this->Paginator->numbers() ?>
-            <?= $this->Paginator->next(__('next') . ' >') ?>
-            <?= $this->Paginator->last(__('last') . ' >>') ?>
-        </ul>
-        <p><?= $this->Paginator->counter(__('Page {{page}} of {{pages}}, showing {{current}} record(s) out of {{count}} total')) ?></p>
-    </div>
-</div>
+
+<?php 
+  echo $this->element('saefi/saefi_index'); 
+?>
\ No newline at end of file
diff --git a/templates/element/aggregates/aggregates_index.php b/templates/element/aggregates/aggregates_index.php
new file mode 100644
index 000000000..918058a9e
--- /dev/null
+++ b/templates/element/aggregates/aggregates_index.php
@@ -0,0 +1,334 @@
+<?php
+$this->assign('AGGREGATE', 'active');
+?>
+
+<div class="row-fluid">
+    <div class="span12">
+        <?php
+        if ($prefix == 'reporter' || $prefix == 'manager') {
+            echo $this->Html->link(
+                '<i class="fa fa-file-o" aria-hidden="true"></i> New Report',
+                array('controller' => 'aggregates', 'action' => 'add'),
+                array('escape' => false, 'class' => 'btn btn-success')
+            );
+        }
+        ?>
+        <h3>Aggregate Reports:<small> <i class="icon-glass"></i> Filter, <i class="icon-search"></i> Search, and <i class="icon-eye-open"></i> view reports</small>
+
+        </h3>
+        <hr class="soften" style="margin: 7px 0px;">
+    </div>
+</div>
+
+<div class="row-fluid">
+    <div class="span12">
+        <?php
+        echo $this->Form->create(null, ['valueSources' => 'query']);
+        ?>
+        <table class="table table-condensed" style="margin-bottom: 2px;">
+            <tbody>
+                <tr>
+                    <td>
+                        <?php
+                        echo $this->Form->control(
+                            'reference_no',
+                            array(
+                                'div' => false,
+                                'placeholder' => 'aggregates/2023',
+                                'class' => 'span12',
+                                'label' => array('class' => 'required', 'text' => 'Reference No.')
+                            )
+                        );
+                        ?>
+                    </td>
+                    <td>
+                        <?php
+                        echo $this->Form->control(
+                            'company_name',
+                            array(
+                                'div' => false,
+                                'placeholder' => '',
+                                'class' => 'span12 unauthorized_index',
+                                'label' => array('class' => 'required', 'text' => 'Company Name ')
+                            )
+                        );
+                        ?>
+                    </td>
+                    <td>
+                        <?php
+                        echo $this->Form->control(
+                            'reporter_email',
+                            array(
+                                'div' => false,
+                                'placeholder' => '',
+                                'class' => 'span12 unauthorized_index',
+                                'label' => array('class' => 'required', 'text' => 'Reporter Email ')
+                            )
+                        );
+                        ?>
+                    </td>
+                    <td>
+                        <?php
+                        echo $this->Form->control(
+                            'start_date',
+                            array(
+                                'div' => false,
+                                'type' => 'text',
+                                'class' => 'control-small unauthorized_index',
+                                'after' => '-to-',
+                                'label' => array('class' => 'required', 'text' => 'Report Dates'),
+                                'placeHolder' => 'Start Date'
+                            )
+                        );
+                        echo $this->Form->control(
+                            'end_date',
+                            array(
+                                'div' => false,
+                                'type' => 'text',
+                                'class' => 'control-small unauthorized_index',
+                                'after' => '<a style="font-weight:normal" onclick="$(\'.unauthorized_index\').val(\'\');" >
+                              <em class="accordion-toggle">clear!</em></a>',
+                                'label' => false,
+                                'placeHolder' => 'End Date'
+                            )
+                        );
+                        ?>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <?php
+                        echo $this->Form->control(
+                            'brand_name',
+                            array(
+                                'div' => false,
+                                'placeholder' => '',
+                                'class' => 'span12 unauthorized_index',
+                                'label' => array('class' => 'required', 'text' => 'Brand Name ')
+                            )
+                        );
+                        ?>
+                    </td>
+                    <td>
+                        <?php
+                        echo $this->Form->control(
+                            'inn_name',
+                            array(
+                                'div' => false,
+                                'placeholder' => '',
+                                'class' => 'span12 unauthorized_index',
+                                'label' => array('class' => 'required', 'text' => 'Inn Name ')
+                            )
+                        );
+                        ?>
+                    </td>
+                    <td>
+                        <?php
+                        echo $this->Form->control(
+                            'submission_frequency',
+                            array(
+                                'div' => false,
+                                'class' => 'span12',
+                                'label' => array('class' => 'required submission_frequency', 'text' => 'Submission Frequency '),
+                                'type' => 'select',
+                                'empty' => true,
+                                'options' => array(
+                                    '0' => 'Monthly',
+                                    '1' => 'Yearly'
+                                )
+                            )
+                        );
+                        ?>
+                    </td>
+                </tr>
+                <tr>
+                    <td><label for="PadrPages" class="required">Pages</label></td>
+                    <td>
+                        <?php
+                        echo $this->Form->control('pages', array(
+                            'type' => 'select',
+                            'div' => false,
+                            'class' => 'control-small',
+                            'empty' => true,
+                            'options' => $page_options,
+                            'label' => false,
+                        ));
+                        ?>
+                    </td>
+                    <td>
+                        <?php
+
+                        ?>
+                    </td>
+                    <td></td>
+                    <td>
+                        <?php
+                        echo $this->Form->button('<i class="icon-search icon-white"></i> Search', array(
+                            'escapeTitle' => false,
+                            'class' => 'btn btn-primary',
+                            'div' => 'control-group',
+                            'div' => false,
+                            'formnovalidate' => 'formnovalidate',
+                            'style' => array('margin-bottom: 5px')
+                        ));
+                        ?>
+                    </td>
+                    <td>
+                        <?php
+                        echo $this->Html->link('<i class="icon-remove"></i> Clear', array('action' => 'index'), array('class' => 'btn', 'escape' => false, 'style' => array('margin-bottom: 5px')));
+                        ?>
+                    </td>
+                    <td>
+                        <?php
+                        // echo $this->Html->link('<i class="fa fa-file-excel-o" aria-hidden="true"></i> Excel', array('action' => 'index', 'ext' => 'csv', '?' => $this->request->query), array('class' => 'btn btn-success', 'escape' => false));
+                        ?>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+        <p>
+            <?php
+            echo $this->Paginator->counter(
+                __('Page <span class="badge">{{page}}</span> of <span class="badge">{{pages}}</span>, 
+    showing <span class="badge">{{current}}</span> PBRERs out of 
+    <span class="badge badge-inverse">{{count}}</span> total, starting on record <span class="badge">{{start}}</span>, 
+    ending on <span class="badge">{{end}}</span>')
+            );
+            ?>
+        </p>
+        <?php echo $this->Form->end(); ?>
+
+        <div class="pagination">
+            <ul>
+                <?= $this->Paginator->first('<< ' . __('first')) ?>
+                <?= $this->Paginator->prev('< ' . __('previous')) ?>
+                <?= $this->Paginator->numbers() ?>
+                <?= $this->Paginator->next(__('next') . ' >') ?>
+                <?= $this->Paginator->last(__('last') . ' >>') ?>
+            </ul>
+        </div>
+
+        <table class="table  table-bordered table-striped">
+            <thead>
+                <tr>
+                    <th><?php echo $this->Paginator->sort('id'); ?></th>
+                    <th><?php echo $this->Paginator->sort('reference_no'); ?></th>
+                    <th><?php echo $this->Paginator->sort('brand_name'); ?></th>
+                    <th><?php echo $this->Paginator->sort('inn_name'); ?></th>
+                    <th><?php echo $this->Paginator->sort('reporter_email'); ?></th>
+                    <th><?php echo $this->Paginator->sort('created'); ?></th>
+                    <th><?php echo $this->Paginator->sort('date_submitted'); ?></th>
+                    <th class="actions"><?php echo __('Actions'); ?></th>
+                </tr>
+            </thead>
+            <tbody>
+                <?php
+                $counter = 0;
+                foreach ($aggregates as $aggregate) : ?>
+                    <tr class="">
+                        <td><?php
+                            $counter++;
+                            echo $counter; ?>&nbsp;</td>
+                        <td>
+                            <?php
+                            echo $this->Html->link($aggregate['reference_no'], array('action' => 'view', $aggregate['id']), array('escape' => false));
+                            ?>&nbsp;</td>
+                        <td>
+                            <?php
+                            echo $this->Text->truncate($aggregate['brand_name'], 42);
+                            if ($aggregate['report_type'] == 'Followup') {
+                                echo "<br> Initial: ";
+                                echo $this->Html->link(
+                                    '<label class="label label-info">' . $aggregate['reference_no'] . '</label>',
+                                    array('action' => 'view', $aggregate['aggregate_id']),
+                                    array('escape' => false)
+                                );
+                            }
+                            ?>&nbsp;
+                        </td>
+                        <td><?php echo h($aggregate['inn_name']); ?>&nbsp;</td>
+                        <td><?php echo h($aggregate['reporter_email']); ?>&nbsp;</td>
+                        <td><?php echo h($aggregate['created']); ?>&nbsp;</td>
+                        <td><?php echo h($aggregate['submitted_date']); ?>&nbsp;</td>
+                        <td class="actions">
+                            <?php
+                            if ($aggregate['submitted'] > 1) {
+                                echo $this->Html->link(
+                                    '<span class="label label-info tooltipper" title="View"><i class="fa fa-eye" aria-hidden="true"></i> View </span>',
+                                    array('controller' => 'aggregates', 'action' => 'view', $aggregate['id']),
+                                    array('escape' => false)
+                                );
+                                echo "&nbsp;";
+                                if ($prefix == 'reporter'  and $this->request->getSession()->read('Auth.User.user_type') != 'Public Health Program') echo $this->Form->postLink('<span class="label label-inverse tooltipper" data-toggle="tooltip" title="Add follow up report"> <i class="fa fa-facebook" aria-hidden="true"></i> Followup </span>', array('controller' => 'aggregates', 'action' => 'followup', $aggregate['id']), array('escape' => false), __('Add a followup report?'));
+
+
+                                echo "&nbsp;";
+                                if (($prefix == 'manager' || $prefix == 'reviewer') && $aggregate['user_id'] == $this->request->getSession()->read('Auth.User.id'))  echo $this->Form->postLink('<span class="label label-inverse tooltipper" data-toggle="tooltip" title="Add follow up report"> <i class="fa fa-facebook" aria-hidden="true"></i> Followup </span>', array('controller' => 'aggregates', 'action' => 'followup', $aggregate['id']), array('escape' => false), __('Add a followup report?'));
+                                echo "&nbsp;";
+                                if (($prefix == 'manager' || $prefix == 'reviewer') && $aggregate['copied'] == 2) echo $this->Html->link(
+                                    '<span class="label label-success tooltipper" title="Edit"><i class="fa fa-pencil-square-o" aria-hidden="true"></i> Edit </span>',
+                                    array('controller' => 'aggregates', 'action' => 'edit', $aggregate['id']),
+                                    array('escape' => false)
+                                );
+                                echo "&nbsp;";
+                                // if (($prefix == 'manager' || $prefix == 'reviewer') && $aggregate['copied'] == 0) echo $this->Form->postLink('<span class="badge badge-success tooltipper" data-toggle="tooltip" title="Copy & Edit"> <i class="fa fa-copy" aria-hidden="true"></i> Copy </span>', array('controller' => 'aggregates', 'action' => 'copy', $aggregate['id']), array('escape' => false), __('Create a clean copy to edit?'));
+                                if (($prefix == 'manager' || $prefix == 'reviewer')) echo $this->Html->link(
+                                    '<span class="label label-warning tooltipper" title="View"><i class="fa fa-refresh" aria-hidden="true"></i> Archive </span>',
+                                    array('controller' => 'aggregates', 'action' => 'archive', $aggregate['id']),
+                                    array('escape' => false),
+                                    __('Are you sure you want to archive the report?')
+                                );
+                            } else {
+                                if ($prefix == 'reporter') echo $this->Html->link(
+                                    '<span class="label label-success tooltipper" title="Edit"><i class="fa fa-pencil-square-o" aria-hidden="true"></i> Edit </span>',
+                                    array('controller' => 'aggregates', 'action' => 'edit', $aggregate['id']),
+                                    array('escape' => false)
+                                );
+                                echo "&nbsp;";
+                                if (($prefix == 'reporter' || $prefix == 'manager') && $aggregate['submitted'] == 0) {
+                                    echo "&nbsp;";
+                                    echo $this->Form->postLink('<span class="label label-warning tooltipper" title="Delete"><i class="fa fa-trash-o" aria-hidden="true"></i> Delete </span>', array('controller' => 'aggregates', 'action' => 'delete', $aggregate['id']), array('escape' => false), __('Are you sure you want to delete this report?
+                                    Note: This action cannot be undone.'));
+                                }
+                                echo "&nbsp;";
+                                if ($prefix == 'manager' || $prefix == 'reviewer') echo $this->Html->link(
+                                    '<span class="label label-info tooltipper" title="View"><i class="fa fa-eye" aria-hidden="true"></i> View </span>',
+                                    array('controller' => 'aggregates', 'action' => 'view', $aggregate['id']),
+                                    array('escape' => false)
+                                );
+                            }
+                            ?>
+                        </td>
+                    </tr>
+                <?php endforeach; ?>
+            </tbody>
+        </table>
+    </div>
+</div>
+
+
+<script type="text/javascript">
+    $(function() {
+        var adates = $('#AggregateStartDate, #AggregateEndDate').datepicker({
+            minDate: "-100Y",
+            maxDate: "-0D",
+            dateFormat: 'dd-mm-yy',
+            format: 'dd-mm-yy',
+            endDate: '-0d',
+            showButtonPanel: true,
+            changeMonth: true,
+            changeYear: true,
+            showAnim: 'show',
+            onSelect: function(selectedDate) {
+                var option = this.id == "AggregateStartDate" ? "minDate" : "maxDate",
+                    instance = $(this).data("datepicker"),
+                    date = $.datepicker.parseDate(
+                        instance.settings.dateFormat ||
+                        $.datepicker._defaults.dateFormat,
+                        selectedDate, instance.settings);
+                adates.not(this).datepicker("option", option, date);
+            }
+        });
+
+    });
+</script>
\ No newline at end of file
diff --git a/templates/element/ce2b/ce2b_index.php b/templates/element/ce2b/ce2b_index.php
new file mode 100644
index 000000000..f1a42791f
--- /dev/null
+++ b/templates/element/ce2b/ce2b_index.php
@@ -0,0 +1,362 @@
+<?php
+$this->assign('E2B', 'active');
+?>
+
+<div class="row-fluid">
+    <div class="span12">
+        <?php
+        if ($prefix == 'reporter' || $prefix == 'manager') {
+            echo $this->Html->link(
+                '<i class="fa fa-file-o" aria-hidden="true"></i> New E2b',
+                array('controller' => 'ce2bs', 'action' => 'add'),
+                array('escape' => false, 'class' => 'btn btn-success')
+            );
+        }
+        ?>
+        <h3>E2b Reports:<small> <i class="icon-glass"></i> Filter, <i class="icon-search"></i> Search, and <i class="icon-eye-open"></i> view reports</small>
+
+        </h3>
+        <hr class="soften" style="margin: 7px 0px;">
+    </div>
+</div>
+
+<div class="row-fluid">
+    <div class="span12">
+        <?php
+         echo $this->Form->create(null, ['valueSources' => 'query']);
+        ?>
+        <table class="table table-condensed" style="margin-bottom: 2px;">
+            <tbody>
+                <tr>
+                    <td>
+                        <?php
+                        echo $this->Form->control(
+                            'reference_no',
+                            array(
+                                'div' => false,
+                                'placeholder' => 'e2b/2023',
+                                'class' => 'span12',
+                                'label' => array('class' => 'required', 'text' => 'Reference No.')
+                            )
+                        );
+                        ?>
+                    </td>
+                    <td>
+                        <?php
+                        echo $this->Form->control(
+                            'company_name',
+                            array(
+                                'div' => false,
+                                'placeholder' => '',
+                                'class' => 'span12 unauthorized_index',
+                                'label' => array('class' => 'required', 'text' => 'Company Name ')
+                            )
+                        );
+                        ?>
+                    </td>
+                    <td>
+                        <?php
+                        echo $this->Form->control(
+                            'reporter_email',
+                            array(
+                                'div' => false,
+                                'placeholder' => '',
+                                'class' => 'span12 unauthorized_index',
+                                'label' => array('class' => 'required', 'text' => 'Reporter Email ')
+                            )
+                        );
+                        ?>
+                    </td>
+                    <td>
+                        <?php
+                        echo $this->Form->control(
+                            'start_date',
+                            array(
+                                'div' => false,
+                                'type' => 'text',
+                                'class' => 'control-small unauthorized_index',
+                                'after' => '-to-',
+                                'label' => array('class' => 'required', 'text' => 'Report Dates'),
+                                'placeHolder' => 'Start Date'
+                            )
+                        );
+                        echo $this->Form->control(
+                            'end_date',
+                            array(
+                                'div' => false,
+                                'type' => 'text',
+                                'class' => 'control-small unauthorized_index',
+                                'after' => '<a style="font-weight:normal" onclick="$(\'.unauthorized_index\').val(\'\');" >
+                              <em class="accordion-toggle">clear!</em></a>',
+                                'label' => false,
+                                'placeHolder' => 'End Date'
+                            )
+                        );
+                        ?>
+                    </td>
+                </tr>
+
+                <tr>
+                    <td>
+                        <?php
+                        echo $this->Form->control(
+                            'drug_name',
+                            array(
+                                'div' => false,
+                                'placeholder' => 'drug name',
+                                'class' => 'span12 unauthorized_index',
+                                'label' => array('class' => 'required', 'text' => 'Drug Name')
+                            )
+                        );
+                        ?>
+
+                        <h5>Serious?</h5>
+                        <?php
+                        echo $this->Form->control('serious', array(
+                            'options' => array('1' => 'Yes', '0' => 'No'),
+                            'legend' => false,
+                            'type' => 'radio',
+                            'label' => false
+                        ));
+                        ?>
+                    </td>
+                    <td>
+                        <?php
+                        echo $this->Form->control(
+                            'inn',
+                            array('div' => false, 'placeholder' => 'Brand Name', 'class' => 'span12 unauthorized_index', 'label' => array('class' => 'required', 'text' => 'Brand Name'))
+                        );
+                        ?>
+                    </td>
+                    <td>
+                        <?php
+                        echo $this->Form->control(
+                            'sender_unique_identifier',
+                            array('div' => false, 'placeholder' => 'eg KE-xx', 'class' => 'span12 unauthorized_index', 'label' => array('class' => 'required', 'text' => 'Sender Identifier'))
+                        );
+                        ?>
+                    </td>
+                    <td>
+                        <?php
+                        echo $this->Form->control(
+                            'sender_organization',
+                            array('div' => false, 'placeholder' => 'Sender\'s Org', 'class' => 'span12 unauthorized_index', 'label' => array('class' => 'required', 'text' => 'Sender\'s Organization'))
+                        );
+                        ?>
+
+
+                    </td>
+                </tr>
+                <tr>
+                    <td><label for="PadrPages" class="required">Pages</label></td>
+                    <td>
+                        <?php
+                        echo $this->Form->control('pages', array(
+                            'type' => 'select',
+                            'div' => false,
+                            'class' => 'control-small',
+                            // 'selected' => $this->request->params['paging']['limit'],
+                            'empty' => true,
+                            // 'options' => $page_options,
+                            'label' => false,
+                        ));
+                        ?>
+                    </td>
+                    <td>
+                        <?php
+
+                        ?>
+                    </td>
+                    <td></td>
+                    <td>
+                        <?php
+                        echo $this->Form->button('<i class="icon-search icon-white"></i> Search', array(
+                            'escapeTitle' => false,
+                            'class' => 'btn btn-primary',
+                            'div' => 'control-group',
+                            'div' => false,
+                            'formnovalidate' => 'formnovalidate',
+                            'style' => array('margin-bottom: 5px')
+                        ));
+                        ?>
+                    </td>
+                    <td>
+                        <?php
+                        echo $this->Html->link('<i class="icon-remove"></i> Clear', array('action' => 'index'), array('class' => 'btn', 'escape' => false, 'style' => array('margin-bottom: 5px')));
+                        ?>
+                    </td>
+                    <td>
+                        <?php
+                        // echo $this->Html->link('<i class="fa fa-file-excel-o" aria-hidden="true"></i> Excel', array('action' => 'index', 'ext' => 'csv', '?' => $this->request->query), array('class' => 'btn btn-success', 'escape' => false));
+                        ?>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+        <p>
+            <?php
+            echo $this->Paginator->counter(
+                __('Page <span class="badge">{{page}}</span> of <span class="badge">{{pages}}</span>, 
+    showing <span class="badge">{{current}}</span> Ce2bs out of 
+    <span class="badge badge-inverse">{{count}}</span> total, starting on record <span class="badge">{{start}}</span>, 
+    ending on <span class="badge">{{end}}</span>')
+            );
+            ?>
+        </p>
+        <?php echo $this->Form->end(); ?>
+
+        <div class="pagination">
+            <ul>
+                <?= $this->Paginator->first('<< ' . __('first')) ?>
+                <?= $this->Paginator->prev('< ' . __('previous')) ?>
+                <?= $this->Paginator->numbers() ?>
+                <?= $this->Paginator->next(__('next') . ' >') ?>
+                <?= $this->Paginator->last(__('last') . ' >>') ?>
+            </ul>
+        </div>
+
+        <table class="table  table-bordered table-striped">
+            <thead>
+                <tr>
+                    <th><?php echo $this->Paginator->sort('id'); ?></th>
+                    <th><?php echo $this->Paginator->sort('reference_no'); ?></th>
+                    <th><?php echo $this->Paginator->sort('company_name'); ?></th>
+                    <th><?php echo $this->Paginator->sort('reporter_email'); ?></th>
+                    <th><?php echo $this->Paginator->sort('e2b_file_type'); ?></th>
+                    <th><?php echo $this->Paginator->sort('created'); ?></th>
+                    <th><?php echo $this->Paginator->sort('submitted_date', 'Date Submitted'); ?></th>
+                    <th class="actions"><?php echo __('Actions'); ?></th>
+                </tr>
+            </thead>
+            <tbody>
+                <?php
+                foreach ($ce2bs as $ce2b) : ?>
+                    <tr class="">
+                        <td><?php echo h($ce2b['id']); ?>&nbsp;</td>
+                        <td>
+                            <?php
+                            if ($ce2b['submitted'] > 1) {
+                                echo $this->Html->link($ce2b['reference_no'], array('action' => 'view', $ce2b['id']), array('escape' => false, 'class' => 'text-' . ((isset($ce2b['serious']) && $ce2b['serious'] == '1') ? 'error' : 'success')));
+                            } else {
+                                echo $this->Html->link($ce2b['reference_no'], array('action' => (($prefix == 'reporter') ? 'edit' : 'view'), $ce2b['id']), array('escape' => false, 'class' => 'text-' . ((isset($ce2b['serious']) && $ce2b['serious'] == '1') ? 'error' : 'success')));
+                            }
+                            ?>&nbsp;
+                        </td>
+                        <td><?php echo h($ce2b['company_name']);
+                            if ($ce2b['report_type'] == 'Followup') {
+                                echo "<br> <b>Initial:</b> ";
+                                echo $this->Html->link(
+                                    '<label class="label label-info">' . $ce2b['reference_no'] . '</label>',
+                                    array('action' => 'view', $ce2b['ce2b_id']),
+                                    array('escape' => false)
+                                );
+                            }
+
+
+                            ?>&nbsp;</td>
+                        <td><?php echo h($ce2b['reporter_email']); ?>&nbsp;</td>
+                        <td><?php echo h($ce2b['e2b_type']); ?>&nbsp;</td>
+                        <td><?php echo h($ce2b['created']); ?>&nbsp;</td>
+                        <td><?php echo h($ce2b['submitted_date']); ?>&nbsp;</td>
+                        <td class="actions">
+                            <?php
+                            if ($ce2b['submitted'] > 1) {
+                                echo $this->Html->link(
+                                    '<span class="label label-info tooltipper" title="View"><i class="fa fa-eye" aria-hidden="true"></i> View </span>',
+                                    array('controller' => 'ce2bs', 'action' => 'view', $ce2b['id']),
+                                    array('escape' => false)
+                                );
+                                echo "&nbsp;";
+                                if ($prefix == 'reporter'  and $this->request->getSession()->read('Auth.User.user_type') != 'Public Health Program') echo $this->Form->postLink('<span class="label label-inverse tooltipper" data-toggle="tooltip" title="Add follow up report"> <i class="fa fa-facebook" aria-hidden="true"></i> Followup </span>', array('controller' => 'ce2bs', 'action' => 'followup', $ce2b['id']), array('escape' => false), __('Add a followup report?'));
+                                echo "&nbsp;";
+                                if (($prefix == 'manager' || $prefix == 'reviewer')) echo $this->Form->postLink('<span class="label label-inverse tooltipper" data-toggle="tooltip" title="Download E2B file"> <i class="fa fa-etsy" aria-hidden="true"></i> 2 <i class="fa fa-bold" aria-hidden="true"></i> </span>', array('controller' => 'ce2bs', 'action' => 'download', $ce2b['id'], 'ext' => 'xml', 'manager' => false), array('escape' => false), __('Download E2B?'));
+                                echo "&nbsp;";
+                                if (($prefix == 'manager' || $prefix == 'reviewer') && empty($ce2b['vigiflow_ref']) && $ce2b['copied'] == 2) echo $this->Html->link(
+                                    '<span class="label label-warning tooltipper" title="Send to vigiflow"><i class="fa fa-paper-plane-o" aria-hidden="true"></i> Vigiflow </span>',
+                                    array('controller' => 'ce2bs', 'action' => 'vigiflow', $ce2b['id'], 'manager' => false),
+                                    array('escape' => false)
+                                );
+
+                                //Create a follow up as a manager
+                                echo "&nbsp;";
+                                if (($prefix == 'manager' || $prefix == 'reviewer') && $ce2b['user_id'] == $this->request->getSession()->read('Auth.User.id'))  echo $this->Form->postLink('<span class="label label-inverse tooltipper" data-toggle="tooltip" title="Add follow up report"> <i class="fa fa-facebook" aria-hidden="true"></i> Followup </span>', array('controller' => 'ce2bs', 'action' => 'followup', $ce2b['id']), array('escape' => false), __('Add a followup report?'));
+                                echo "&nbsp;";
+                                if (($prefix == 'manager' || $prefix == 'reviewer') && $ce2b['copied'] == 2) echo $this->Html->link(
+                                    '<span class="label label-success tooltipper" title="Edit"><i class="fa fa-pencil-square-o" aria-hidden="true"></i> Edit </span>',
+                                    array('controller' => 'ce2bs', 'action' => 'edit', $ce2b['id']),
+                                    array('escape' => false)
+                                );
+                                echo "&nbsp;";
+                                if (($prefix == 'manager' || $prefix == 'reviewer') && $ce2b['copied'] == 0) echo $this->Form->postLink('<span class="badge badge-success tooltipper" data-toggle="tooltip" title="Copy & Edit"> <i class="fa fa-copy" aria-hidden="true"></i> Copy </span>', array('controller' => 'ce2bs', 'action' => 'copy', $ce2b['id']), array('escape' => false), __('Create a clean copy to edit?'));
+
+                                echo "&nbsp;";
+                                echo $this->Html->link(
+                                    '<span class="label label-default tooltipper" title="View"><i class="fa fa-file-pdf-o" aria-hidden="true"></i> PDF </span>',
+                                    array('controller' => 'ce2bs', 'action' => 'view', 'ext' => 'pdf', $ce2b['id']),
+                                    array('escape' => false)
+                                );
+                                if (($prefix == 'manager' || $prefix == 'reviewer')) {
+                                    echo $this->Html->link(
+                                        '<span class="label label-warning tooltipper" title="View"><i class="fa fa-refresh" aria-hidden="true"></i> Archive </span>',
+                                        array('controller' => 'ce2bs', 'action' => 'archive', $ce2b['id']),
+                                        array('escape' => false),
+                                        __('Are you sure you want to archive the report?')
+                                    );
+                                }
+
+                                // PDF Download
+
+                            } else {
+                                if ($prefix == 'reporter') echo $this->Html->link(
+                                    '<span class="label label-success tooltipper" title="Edit"><i class="fa fa-pencil-square-o" aria-hidden="true"></i> Edit </span>',
+                                    array('controller' => 'ce2bs', 'action' => 'edit', $ce2b['id']),
+                                    array('escape' => false)
+                                );
+                                echo "&nbsp;";
+                                if (($prefix == 'reporter' || $prefix == 'manager') && $ce2b['submitted'] == 0) {
+                                    echo "&nbsp;";
+                                    echo $this->Form->postLink('<span class="label label-warning tooltipper" title="Delete"><i class="fa fa-trash-o" aria-hidden="true"></i> Delete </span>', array('controller' => 'ce2bs', 'action' => 'delete', $ce2b['id']), array('escape' => false), __('Are you sure you want to delete this report?
+                                    Note: This action cannot be undone.'));
+                                }
+                                echo "&nbsp;";
+                                if ($prefix == 'manager' || $prefix == 'reviewer') echo $this->Html->link(
+                                    '<span class="label label-info tooltipper" title="View"><i class="fa fa-eye" aria-hidden="true"></i> View </span>',
+                                    array('controller' => 'ce2bs', 'action' => 'view', $ce2b['id']),
+                                    array('escape' => false)
+                                );
+                            }
+                            ?>
+                        </td>
+                    </tr>
+                <?php endforeach; ?>
+            </tbody>
+        </table>
+    </div>
+</div>
+
+
+<script type="text/javascript">
+    $(function() {
+        var adates = $('#Ce2bStartDate, #Ce2bEndDate').datepicker({
+            minDate: "-100Y",
+            maxDate: "-0D",
+            dateFormat: 'dd-mm-yy',
+            format: 'dd-mm-yy',
+            endDate: '-0d',
+            showButtonPanel: true,
+            changeMonth: true,
+            changeYear: true,
+            showAnim: 'show',
+            onSelect: function(selectedDate) {
+                var option = this.id == "PadrStartDate" ? "minDate" : "maxDate",
+                    instance = $(this).data("datepicker"),
+                    date = $.datepicker.parseDate(
+                        instance.settings.dateFormat ||
+                        $.datepicker._defaults.dateFormat,
+                        selectedDate, instance.settings);
+                adates.not(this).datepicker("option", option, date);
+            }
+        });
+
+    });
+</script>
\ No newline at end of file
diff --git a/templates/element/drugs/index.php b/templates/element/drugs/index.php
index b1bd247ff..4124bacf2 100755
--- a/templates/element/drugs/index.php
+++ b/templates/element/drugs/index.php
@@ -4,7 +4,7 @@
 
 <div class="row-fluid">
   <div class="span12">
- 
+
     <div class="row-fluid">
       <div class="span12">
         <?php
@@ -27,11 +27,7 @@
     </div>
 
     <?php
-    echo $this->Form->create();
-    // 'Drug', array(
-    //   'url' => array_merge(array('action' => 'index'), $this->params['pass']),
-    //   'class' => 'ctr-groups', 'style' => array('padding:9px;', 'background-color: #F5F5F5'),
-    // ));
+    echo $this->Form->create(null, ['valueSources' => 'query']);
     ?>
     <table class="table table-condensed" style="margin-bottom: 2px;">
       <tbody>
@@ -42,7 +38,8 @@
               'brand_name',
               array(
                 'div' => false,
-                'class' => 'span12', 'label' => array('class' => 'required', 'text' => 'Brand Name')
+                'class' => 'span12',
+                'label' => array('class' => 'required', 'text' => 'Brand Name')
               )
             );
             ?>
@@ -53,7 +50,8 @@
               'inn_name',
               array(
                 'div' => false,
-                'class' => 'unauthorized_index span10', 'label' => array('class' => 'required', 'text' => 'INN Name')
+                'class' => 'unauthorized_index span10',
+                'label' => array('class' => 'required', 'text' => 'INN Name')
               )
             );
             ?>
@@ -64,7 +62,8 @@
               'batch_number',
               array(
                 'div' => false,
-                'class' => 'span12', 'label' => array('class' => 'required', 'text' => 'Batch Number')
+                'class' => 'span12',
+                'label' => array('class' => 'required', 'text' => 'Batch Number')
               )
             );
             ?>
@@ -75,7 +74,8 @@
               'manufacturer',
               array(
                 'div' => false,
-                'class' => 'span12', 'label' => array('class' => 'required', 'text' => 'Manufacturer')
+                'class' => 'span12',
+                'label' => array('class' => 'required', 'text' => 'Manufacturer')
               )
             );
             ?>
@@ -93,7 +93,8 @@
               'registration_status',
               array(
                 'div' => false,
-                'class' => 'span12 unauthorized_index', 'label' => array('class' => 'required', 'text' => 'Registration Status')
+                'class' => 'span12 unauthorized_index',
+                'label' => array('class' => 'required', 'text' => 'Registration Status')
               )
             );
             ?>
@@ -104,7 +105,8 @@
               'retention_status',
               array(
                 'div' => false,
-                'class' => 'span12 unauthorized_index', 'label' => array('class' => 'required', 'text' => 'Retention Status')
+                'class' => 'span12 unauthorized_index',
+                'label' => array('class' => 'required', 'text' => 'Retention Status')
               )
             );
             ?>
@@ -115,7 +117,8 @@
               'donation',
               array(
                 'div' => false,
-                'class' => 'span12 unauthorized_index', 'label' => array('class' => 'required', 'text' => 'Donation')
+                'class' => 'span12 unauthorized_index',
+                'label' => array('class' => 'required', 'text' => 'Donation')
               )
             );
             ?>
@@ -136,8 +139,10 @@
           <td>
             <?php
             echo $this->Form->control('pages', array(
-              'type' => 'select', 'div' => false, 'class' => 'control-small', 
-            //   'selected' => $this->request->params['paging']['limit'],
+              'type' => 'select',
+              'div' => false,
+              'class' => 'control-small',
+              //   'selected' => $this->request->params['paging']['limit'],
               'empty' => true,
               'options' => $page_options,
               'label' => false,
@@ -150,8 +155,10 @@
           <td>
             <?php
             echo $this->Form->button('<i class="icon-search icon-white"></i> Search', array(
-                'escapeTitle'=>false,
-              'class' => 'btn btn-primary', 'div' => 'control-group', 'div' => false,
+              'escapeTitle' => false,
+              'class' => 'btn btn-primary',
+              'div' => 'control-group',
+              'div' => false,
               'formnovalidate' => 'formnovalidate',
               'style' => array('margin-bottom: 5px')
             ));
@@ -170,27 +177,27 @@
     </table>
     <p>
       <?php
-          echo $this->Paginator->counter(
-            __('Page <span class="badge">{{page}}</span> of <span class="badge">{{pages}}</span>, 
+      echo $this->Paginator->counter(
+        __('Page <span class="badge">{{page}}</span> of <span class="badge">{{pages}}</span>, 
         showing <span class="badge">{{current}}</span> Drugs out of 
         <span class="badge badge-inverse">{{count}}</span> total, starting on record <span class="badge">{{start}}</span>, 
         ending on <span class="badge">{{end}}</span>')
-        );
+      );
       ?>
     </p>
     <?php echo $this->Form->end(); ?>
 
     <div class="pagination">
       <ul>
-      <?= $this->Paginator->first('<< ' . __('first')) ?>
-                <?= $this->Paginator->prev('< ' . __('previous')) ?>
-                <?= $this->Paginator->numbers() ?>
-                <?= $this->Paginator->next(__('next') . ' >') ?>
-                <?= $this->Paginator->last(__('last') . ' >>') ?>
+        <?= $this->Paginator->first('<< ' . __('first')) ?>
+        <?= $this->Paginator->prev('< ' . __('previous')) ?>
+        <?= $this->Paginator->numbers() ?>
+        <?= $this->Paginator->next(__('next') . ' >') ?>
+        <?= $this->Paginator->last(__('last') . ' >>') ?>
       </ul>
     </div>
 
-    <table class="table  table-bordered table-striped"> 
+    <table class="table  table-bordered table-striped">
       <thead>
         <tr>
           <th><?php echo $this->Paginator->sort('id'); ?></th>
@@ -209,20 +216,20 @@
       <tbody>
         <?php
         foreach ($drugs as $drug) : ?>
-        <tr>
-          <td><?php echo h($drug['id']); ?>&nbsp;</td>
-          <td><?php echo h($drug['batch_number']); ?>&nbsp;</td>
-          <td><?php echo h($drug['brand_name']); ?>&nbsp;</td>
-          <td><?php echo h($drug['inn_name']); ?>&nbsp;</td>
-          <td><?php echo h($drug['manufacturer']); ?>&nbsp;</td>
-          <td><?php echo h($drug['local_trade_rep']); ?>&nbsp;</td>
-          <td><?php echo h($drug['registration_status']); ?>&nbsp;</td>
-          <td><?php echo h($drug['retention_status']); ?>&nbsp;</td>
-          <td><?php echo h($drug['donation']); ?>&nbsp;</td>
-          <td><?php echo h($drug['created']); ?>&nbsp;</td>
-          <td><?php echo h($drug['modified']); ?>&nbsp;</td>
           <tr>
-        <?php endforeach; ?>
+            <td><?php echo h($drug['id']); ?>&nbsp;</td>
+            <td><?php echo h($drug['batch_number']); ?>&nbsp;</td>
+            <td><?php echo h($drug['brand_name']); ?>&nbsp;</td>
+            <td><?php echo h($drug['inn_name']); ?>&nbsp;</td>
+            <td><?php echo h($drug['manufacturer']); ?>&nbsp;</td>
+            <td><?php echo h($drug['local_trade_rep']); ?>&nbsp;</td>
+            <td><?php echo h($drug['registration_status']); ?>&nbsp;</td>
+            <td><?php echo h($drug['retention_status']); ?>&nbsp;</td>
+            <td><?php echo h($drug['donation']); ?>&nbsp;</td>
+            <td><?php echo h($drug['created']); ?>&nbsp;</td>
+            <td><?php echo h($drug['modified']); ?>&nbsp;</td>
+          <tr>
+          <?php endforeach; ?>
       </tbody>
     </table>
   </div>
diff --git a/templates/element/saefi/saefi_index.php b/templates/element/saefi/saefi_index.php
new file mode 100644
index 000000000..494881dac
--- /dev/null
+++ b/templates/element/saefi/saefi_index.php
@@ -0,0 +1,398 @@
+<?php
+$this->assign('SAEFI', 'active');
+?>
+
+<div class="row-fluid">
+    <div class="span12">
+
+        <?php
+        if ($prefix == 'reporter') {
+        ?>
+            <div class="row-fluid">
+                <div class="span12">
+
+                </div>
+            </div>
+        <?php } ?>
+
+        <div class="marketing">
+            <div class="row-fluid">
+                <div class="span12">
+                    <h3>Serious Adverse Event Following Immunization:<small> <i class="icon-glass"></i> Filter, <i class="icon-search"></i> Search, and <i class="icon-eye-open"></i> view reports</small></h3>
+                    <hr class="soften" style="margin: 7px 0px;">
+                </div>
+            </div>
+        </div>
+
+        <?php
+      echo $this->Form->create(null, ['valueSources' => 'query']);
+        ?>
+        <table class="table table-condensed" style="margin-bottom: 2px;">
+            <tbody>
+                <tr>
+                    <td>
+                        <?php
+                        echo $this->Form->control(
+                            'reference_no',
+                            array(
+                                'div' => false,
+                                'placeholder' => 'saefi/2020',
+                                'class' => 'span12',
+                                'label' => array('class' => 'required', 'text' => 'Reference No.')
+                            )
+                        );
+                        ?>
+                    </td>
+                    <td>
+
+                    </td>
+                    <td colspan="2">
+                        <?php
+                        echo $this->Form->control(
+                            'start_date',
+                            array(
+                                'div' => false,
+                                'type' => 'text',
+                                'class' => 'control-small unauthorized_index',
+                                'after' => '-to-',
+                                'label' => array('class' => 'required', 'text' => 'Report Dates'),
+                                'placeHolder' => 'Start Date'
+                            )
+                        );
+                        echo $this->Form->control(
+                            'end_date',
+                            array(
+                                'div' => false,
+                                'type' => 'text',
+                                'class' => 'control-small unauthorized_index',
+                                'after' => '<a style="font-weight:normal" onclick="$(\'.unauthorized_index\').val(\'\');" >
+                              <em class="accordion-toggle">clear!</em></a>',
+                                'label' => false,
+                                'placeHolder' => 'End Date'
+                            )
+                        );
+                        ?>
+                    </td>
+                    <td>
+
+                    </td>
+                    <td>
+
+                    </td>
+                    <td>
+                        <?php
+                        echo $this->Form->control(
+                            'county_id',
+                            array(
+                                'div' => false,
+                                'empty' => true,
+                                'class' => 'control-small',
+                                'label' => array('class' => 'required', 'text' => 'County')
+                            )
+                        );
+                        ?>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+
+                    </td>
+                    <td>
+
+                    </td>
+                    <td colspan="2">
+
+                    </td>
+                    <td>
+
+                    </td>
+                    <td>
+
+                    </td>
+                    <td>
+
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <?php
+                        if ($this->request->getSession()->read('Auth.User.user_type') != 'Public Health Program')  echo $this->Form->control(
+                            'patient_name',
+                            array(
+                                'div' => false,
+                                'placeholder' => 'Patient name',
+                                'class' => 'span12 unauthorized_index',
+                                'label' => array('class' => 'required', 'text' => 'Patient Name')
+                            )
+                        );
+                        ?>
+                    </td>
+                    <td>
+                        <h5>Report Type?</h5>
+                        <?php
+                        echo $this->Form->control('report_type', array(
+                            'options' => array('Initial' => 'Initial', 'Followup' => 'Followup'),
+                            'legend' => false,
+                            'type' => 'radio',
+                            'label' => false,
+                        ));
+                        ?>
+                    </td>
+                    <td>
+
+                    </td>
+                    <td>
+
+                    </td>
+                    <td>
+                        <?php
+                        echo $this->Form->control(
+                            'reporter',
+                            array('div' => false, 'class' => 'span12 unauthorized_index', 'label' => array('class' => 'required', 'text' => 'Reporter'), 'placeholder' => 'Name/Email')
+                        );
+                        ?>
+                    </td>
+                    <td>
+                        <?php
+                        echo $this->Form->control(
+                            'designation_id',
+                            array(
+                                'div' => false,
+                                'empty' => true,
+                                'class' => 'control-small',
+                                'label' => array('class' => 'required', 'text' => 'Designation')
+                            )
+                        );
+                        ?>
+                    </td>
+                    <td>
+                        <h5>Gender</h5>
+                        <?php
+                        echo $this->Form->control('gender', array(
+                            'options' => array('Male' => 'Male', 'Female' => 'Female', 'Unknown' => 'Unknown'),
+                            'legend' => false,
+                            'type' => 'radio',
+                            'label' => false,
+                        ));
+                        ?>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <h5>Report Status</h5>
+                        <?php
+                        echo $this->Form->control('submitted', array(
+                            'options' => array('1' => 'UnSubmitted', '2' => 'Submitted'),
+                            'legend' => false,
+                            'type' => 'radio',
+                            'label' => false,
+                        ));
+                        ?>
+                    </td>
+                    <td> <?php
+                            echo $this->Form->control('health_program', array(
+                                'type' => 'select',
+                                'options' => [
+                                    'Malaria program' => 'Malaria program',
+                                    'National Vaccines and immunisation program' => 'National Vaccines and immunisation program',
+                                    'Neglected tropical diseases program' => 'Neglected tropical diseases program',
+                                    'MNCAH Priority Medicines' => 'MNCAH Priority Medicines',
+                                    'TB program' => 'TB program',
+                                    'NASCOP program' => 'NASCOP program',
+                                    'Cancer/Oncology program' => 'Cancer/Oncology program'
+                                ],
+                                'empty' => true,
+                                'label' => array('class' => 'control-label', 'text' => 'Public Health Program'),
+                                'class' => 'control-xlarge'
+                            ));  ?>
+                    </td>
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                </tr>
+                <tr>
+                    <td><label for="AefiPages" class="required">Pages</label></td>
+                    <td>
+                        <?php
+                        echo $this->Form->control('pages', array(
+                            'type' => 'select',
+                            'div' => false,
+                            'class' => 'control-small', 
+                            'empty' => true,
+                            'options' => $page_options,
+                            'label' => false,
+                        ));
+                        ?>
+                    </td>
+                    <td>
+
+                    </td>
+                    <td></td>
+                    <td>
+                        <?php
+                        echo $this->Form->button('<i class="icon-search icon-white"></i> Search', array(
+                            'escapeTitle' => false,
+                            'class' => 'btn btn-primary',
+                            'div' => 'control-group',
+                            'div' => false,
+                            'formnovalidate' => 'formnovalidate',
+                            'style' => array('margin-bottom: 5px')
+                        ));
+                        ?>
+                    </td>
+                    <td>
+                        <?php
+                        echo $this->Html->link('<i class="icon-remove"></i> Clear', array('action' => 'index'), array('class' => 'btn', 'escape' => false, 'style' => array('margin-bottom: 5px')));
+                        ?>
+                    </td>
+                    <td>
+                        <?php
+                        // echo $this->Html->link('<i class="fa fa-file-excel-o" aria-hidden="true"></i> Excel', array('action' => 'index', 'ext' => 'csv', '?' => $this->request->query), array('class' => 'btn btn-success', 'escape' => false));
+                        ?>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+        <p>
+            <?php
+            echo $this->Paginator->counter(
+                __('Page <span class="badge">{{page}}</span> of <span class="badge">{{pages}}</span>, 
+    showing <span class="badge">{{current}}</span> Saefis out of 
+    <span class="badge badge-inverse">{{count}}</span> total, starting on record <span class="badge">{{start}}</span>, 
+    ending on <span class="badge">{{end}}</span>')
+            );
+            ?>
+        </p>
+        <?php echo $this->Form->end(); ?>
+
+        <div class="pagination">
+            <ul>
+                <?= $this->Paginator->first('<< ' . __('first')) ?>
+                <?= $this->Paginator->prev('< ' . __('previous')) ?>
+                <?= $this->Paginator->numbers() ?>
+                <?= $this->Paginator->next(__('next') . ' >') ?>
+                <?= $this->Paginator->last(__('last') . ' >>') ?>
+            </ul>
+        </div>
+
+        <table class="table  table-bordered table-striped">
+            <thead>
+                <tr>
+                    <th><?php echo $this->Paginator->sort('id'); ?></th>
+                    <th><?php echo $this->Paginator->sort('reference_no'); ?></th>
+                    <th><?php echo $this->Paginator->sort('report_type'); ?></th>
+                    <th><?php echo ($this->request->getSession()->read('Auth.User.user_type') != 'Public Health Program') ? $this->Paginator->sort('patient_name') : $this->Paginator->sort('gender'); ?></th>
+                    <th><?php echo $this->Paginator->sort('reporter_date', 'Date reported'); ?></th>
+                    <th><?php echo $this->Paginator->sort('created', 'Date created'); ?></th>
+                    <th><?php echo $this->Paginator->sort('submitted_date', 'Date Submitted'); ?></th>
+                    <th class="actions"><?php echo __('Actions'); ?></th>
+                </tr>
+            </thead>
+            <tbody>
+                <?php
+                foreach ($saefis as $aefi) : ?>
+                    <tr class="">
+                        <td><?php echo h($aefi['id']); ?>&nbsp;</td>
+                        <td>
+                            <?php
+                            if ($aefi['submitted'] > 1) {
+                                echo $this->Html->link($aefi['reference_no'], array('action' => 'view', $aefi['id']), array('escape' => false, 'class' => 'text-' . ((isset($aefi['serious']) && $aefi['serious'] == 'Yes') ? 'error' : 'success')));
+                            } else {
+                                echo $this->Html->link($aefi['reference_no'], array('action' => (($prefix == 'reporter') ? 'edit' : 'view'), $aefi['id']), array('escape' => false, 'class' => 'text-' . ((isset($aefi['serious']) && $aefi['serious'] == 'Yes') ? 'error' : 'success')));
+                            }
+                            ?>&nbsp;</td>
+                        <td><?php echo h($aefi['report_type']);
+                            if ($aefi['report_type'] == 'Followup') {
+                                echo "<br> Initial: ";
+                                echo $this->Html->link(
+                                    '<label class="label label-info">' . $aefi['reference_no'] . '</label>',
+                                    array('action' => 'view', $aefi['aefi_id']),
+                                    array('escape' => false)
+                                );
+                            }
+                            ?>&nbsp;
+                        </td>
+                        <td><?php echo ($this->request->getSession()->read('Auth.User.user_type') != 'Public Health Program') ? h($aefi['patient_name']) : $aefi['gender']; ?>&nbsp;</td>
+
+                        <td><?php echo h($aefi['reporter_date']); ?>&nbsp;</td>
+                        <td><?php echo h($aefi['created']); ?>&nbsp;</td>
+                        <td><?php echo h($aefi['submitted_date']); ?>&nbsp;</td>
+                        <td class="actions">
+                            <?php
+                            if ($aefi['submitted'] > 1) {
+                                echo $this->Html->link(
+                                    '<span class="label label-info tooltipper" title="View"><i class="fa fa-eye" aria-hidden="true"></i> View </span>',
+                                    array('controller' => 'saefis', 'action' => 'view', $aefi['id']),
+                                    array('escape' => false)
+                                );
+                                echo "&nbsp;";
+                                if (($prefix == 'manager' || $prefix == 'reviewer') && $aefi['copied'] == 2) echo $this->Html->link(
+                                    '<span class="label label-success tooltipper" title="Copy & Edit"><i class="fa fa-pencil-square-o" aria-hidden="true"></i> Edit </span>',
+                                    array('controller' => 'saefis', 'action' => 'edit', $aefi['id']),
+                                    array('escape' => false)
+                                );
+                                echo "&nbsp;";
+                                if (($prefix == 'manager' || $prefix == 'reviewer') && $aefi['copied'] == 0) echo $this->Form->postLink('<span class="badge badge-success tooltipper" data-toggle="tooltip" title="Copy & Edit"> <i class="fa fa-copy" aria-hidden="true"></i> Copy </span>', array('controller' => 'saefis', 'action' => 'copy', $aefi['id']), array('escape' => false), __('Create a clean copy to edit?'));
+                                echo $this->Html->link(
+                                    '<span class="label label-warning tooltipper" title="View"><i class="fa fa-refresh" aria-hidden="true"></i> Archive </span>',
+                                    array('controller' => 'saefis', 'action' => 'archive', $aefi['id']),
+                                    array('escape' => false),
+                                    __('Are you sure you want to archive the report?')
+                                );
+                            } else {
+                                if ($prefix == 'reporter' and $this->request->getSession()->read('Auth.User.user_type') != 'Public Health Program') echo $this->Html->link(
+                                    '<span class="label label-success tooltipper" title="Edit"><i class="fa fa-pencil-square-o" aria-hidden="true"></i> Edit </span>',
+                                    array('controller' => 'saefis', 'action' => 'edit', $aefi['id']),
+                                    array('escape' => false)
+                                );
+                            }
+
+
+                            echo "&nbsp;";
+                            echo $this->Html->link(
+                                '<span class="label label-default tooltipper" title="View"><i class="fa fa-file-pdf-o" aria-hidden="true"></i> PDF </span>',
+                                array('action' => 'view', 'ext' => 'pdf', $aefi['id']),
+                                array('escape' => false)
+                            );
+                            // Check if the user is a reporter and the report is not submitted
+                            if (($prefix == 'reporter' || $prefix == 'manager') && $aefi['submitted'] == 0 && $this->request->getSession()->read('Auth.User.user_type') != 'Public Health Program') {
+                                echo "&nbsp;";
+                                echo $this->Form->postLink('<span class="label label-warning tooltipper" data-toggle="tooltip" title="Delete"> <i class="fa fa-trash" aria-hidden="true"></i> Delete </span>', array('controller' => 'saefis', 'action' => 'delete', $aefi['id']), array('escape' => false), __('Are you sure you want to delete this report? 
+                Note: This action cannot be undone.'));
+                            }
+                            ?>
+                        </td>
+                    </tr>
+                <?php endforeach; ?>
+            </tbody>
+        </table>
+    </div>
+</div>
+
+<script type="text/javascript">
+    $(function() {
+        var adates = $('#AefiStartDate, #AefiEndDate').datepicker({
+            minDate: "-100Y",
+            maxDate: "-0D",
+            dateFormat: 'dd-mm-yy',
+            format: 'dd-mm-yyyy',
+            endDate: '-0d',
+            showButtonPanel: true,
+            changeMonth: true,
+            changeYear: true,
+            showAnim: 'show',
+            onSelect: function(selectedDate) {
+                var option = this.id == "AefiStartDate" ? "minDate" : "maxDate",
+                    instance = $(this).data("datepicker"),
+                    date = $.datepicker.parseDate(
+                        instance.settings.dateFormat ||
+                        $.datepicker._defaults.dateFormat,
+                        selectedDate, instance.settings);
+                adates.not(this).datepicker("option", option, date);
+            }
+        });
+
+    });
+</script>
\ No newline at end of file