diff --git a/app/templates/EncryptionKeys/index.php b/app/templates/EncryptionKeys/index.php
index b7ea537..2d197fa 100644
--- a/app/templates/EncryptionKeys/index.php
+++ b/app/templates/EncryptionKeys/index.php
@@ -73,8 +73,8 @@ echo $this->element('genericElements/IndexTable/index_table', [
         'pull' => 'right',
         'actions' => [
             [
-                'url' => '/endcrpyionKeys/view',
-                'url_params_data_paths' => ['id'],
+                'onclick' => 'populateAndLoadModal(\'/encryptionKeys/edit/[onclick_params_data_path]\');',
+                'onclick_params_data_path' => 'id',
                 'icon' => 'eye'
             ],
             [
diff --git a/app/templates/Individuals/index.php b/app/templates/Individuals/index.php
index 491a9fb..249314c 100644
--- a/app/templates/Individuals/index.php
+++ b/app/templates/Individuals/index.php
@@ -5,6 +5,17 @@ echo $this->element('genericElements/IndexTable/index_table', [
         'top_bar' => [
             'pull' => 'right',
             'children' => [
+                [
+                    'type' => 'simple',
+                    'children' => [
+                        'data' => [
+                            'type' => 'simple',
+                            'text' => __('Add individual'),
+                            'class' => 'btn btn-primary',
+                            'popover_url' => '/individuals/add'
+                        ]
+                    ]
+                ],
                 [
                     'type' => 'search',
                     'button' => __('Filter'),
@@ -58,8 +69,8 @@ echo $this->element('genericElements/IndexTable/index_table', [
                 'icon' => 'eye'
             ],
             [
-                'url' => '/individuals/edit',
-                'url_params_data_paths' => ['id'],
+                'onclick' => 'populateAndLoadModal(\'/individuals/edit/[onclick_params_data_path]\');',
+                'onclick_params_data_path' => 'id',
                 'icon' => 'edit'
             ],
             [
diff --git a/app/templates/Individuals/view.php b/app/templates/Individuals/view.php
index b2bc237..6c4d6a8 100644
--- a/app/templates/Individuals/view.php
+++ b/app/templates/Individuals/view.php
@@ -2,7 +2,6 @@
 echo $this->element(
     '/genericElements/SingleViews/single_view',
     [
-        'title' => __('Individual View'),
         'data' => $entity,
         'fields' => [
             [
@@ -32,7 +31,7 @@ echo $this->element(
             [
                 'key' => __('Alignments'),
                 'type' => 'alignment',
-                'path' => 'alignments',
+                'path' => '',
                 'scope' => 'individuals'
             ]
         ],
diff --git a/app/templates/Organisations/index.php b/app/templates/Organisations/index.php
index 2957a09..3870899 100644
--- a/app/templates/Organisations/index.php
+++ b/app/templates/Organisations/index.php
@@ -5,6 +5,17 @@ echo $this->element('genericElements/IndexTable/index_table', [
         'top_bar' => [
             'pull' => 'right',
             'children' => [
+                [
+                    'type' => 'simple',
+                    'children' => [
+                        'data' => [
+                            'type' => 'simple',
+                            'text' => __('Add organisation'),
+                            'class' => 'btn btn-primary',
+                            'popover_url' => '/organisations/add'
+                        ]
+                    ]
+                ],
                 [
                     'type' => 'search',
                     'button' => __('Filter'),
@@ -68,8 +79,8 @@ echo $this->element('genericElements/IndexTable/index_table', [
                 'icon' => 'eye'
             ],
             [
-                'url' => '/organisations/edit',
-                'url_params_data_paths' => ['id'],
+                'onclick' => 'populateAndLoadModal(\'/organisations/edit/[onclick_params_data_path]\');',
+                'onclick_params_data_path' => 'id',
                 'icon' => 'edit'
             ],
             [
diff --git a/app/templates/Organisations/view.php b/app/templates/Organisations/view.php
index 7ed0862..e8351ef 100644
--- a/app/templates/Organisations/view.php
+++ b/app/templates/Organisations/view.php
@@ -40,7 +40,7 @@ echo $this->element(
             [
                 'key' => __('Alignments'),
                 'type' => 'alignment',
-                'path' => 'alignments',
+                'path' => '',
                 'scope' => 'organisations'
             ]
         ],
diff --git a/app/templates/Roles/index.php b/app/templates/Roles/index.php
index 6de46a5..40c0039 100644
--- a/app/templates/Roles/index.php
+++ b/app/templates/Roles/index.php
@@ -5,6 +5,17 @@ echo $this->element('genericElements/IndexTable/index_table', [
         'top_bar' => [
             'pull' => 'right',
             'children' => [
+                [
+                    'type' => 'simple',
+                    'children' => [
+                        'data' => [
+                            'type' => 'simple',
+                            'text' => __('Add role'),
+                            'class' => 'btn btn-primary',
+                            'popover_url' => '/roles/add'
+                        ]
+                    ]
+                ],
                 [
                     'type' => 'search',
                     'button' => __('Filter'),
@@ -54,9 +65,9 @@ echo $this->element('genericElements/IndexTable/index_table', [
                 'icon' => 'eye'
             ],
             [
-                'url' => '/roles/edit',
-                'url_params_data_paths' => ['id'],
-                'icon' => 'edit'
+                'onclick' => 'populateAndLoadModal(\'/roles/edit/[onclick_params_data_path]\');',
+                'onclick_params_data_path' => 'id',
+                'icon' => 'edit',
             ],
             [
                 'onclick' => 'populateAndLoadModal(\'/roles/delete/[onclick_params_data_path]\');',