diff --git a/Theme/Backend/Components/AccountGroupSelector/BaseView.php b/Theme/Backend/Components/AccountGroupSelector/BaseView.php
index a2e5937..8be4b4a 100644
--- a/Theme/Backend/Components/AccountGroupSelector/BaseView.php
+++ b/Theme/Backend/Components/AccountGroupSelector/BaseView.php
@@ -33,7 +33,6 @@ class BaseView extends View
 
         $view = new View($app, $request, $response);
         $view->setTemplate('/Modules/Profile/Theme/Backend/Components/AccountGroupSelector/popup');
-
         $this->addData('popup', $view);
     }
 
diff --git a/Theme/Backend/Components/AccountGroupSelector/PopupView.php b/Theme/Backend/Components/AccountGroupSelector/PopupView.php
deleted file mode 100644
index e69de29..0000000
diff --git a/Theme/Backend/Components/AccountGroupSelector/base.tpl.php b/Theme/Backend/Components/AccountGroupSelector/base.tpl.php
index a2eb01e..7b602a6 100644
--- a/Theme/Backend/Components/AccountGroupSelector/base.tpl.php
+++ b/Theme/Backend/Components/AccountGroupSelector/base.tpl.php
@@ -2,19 +2,21 @@
 <button type="button" data-action='[
     {
         "listener": "click", "action": [
-            {"type": "dom.popup", "tpl": "acc-grp-tpl", "aniIn": "fadeIn"},
-            {"type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/admin/account?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"},
-            {"type": "dom.table.append", "id": "acc-grp-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name/0"}, "position": -1}
+            {"key": 1, "type": "dom.popup", "tpl": "acc-grp-tpl", "aniIn": "fadeIn"},
+            {"key": 2, "type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/admin/account?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"},
+            {"key": 3, "type": "dom.table.append", "id": "acc-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name/0"}, "position": -1},
+            {"key": 4, "type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/admin/account?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"},
+            {"key": 5, "type": "dom.table.append", "id": "grp-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name/0"}, "position": -1}
         ]
     }
 ]' formaction=""><i class="fa fa-book"></i></button>
 <input type="text" list="<?= $this->getId(); ?>-datalist" id="<?= $this->getId(); ?>" name="receiver" placeholder="&#xf007; Guest" data-action='[
     {
         "listener": "keyup", "action": [
-            {"type": "utils.timer", "id": "<?= $this->getId(); ?>", "delay": 500, "resets": true},
-            {"type": "dom.datalist.clear", "id": "<?= $this->getId(); ?>-datalist"},
-            {"type": "message.request", "uri": "{/base}/{/lang}/api/admin/find/account?search={#<?= $this->getId(); ?>}", "method": "GET", "request_type": "json"},
-            {"type": "dom.datalist.append", "id": "<?= $this->getId(); ?>-datalist", "value": "id", "text": "name"}
+            {"key": 1, "type": "utils.timer", "id": "<?= $this->getId(); ?>", "delay": 500, "resets": true},
+            {"key": 2, "type": "dom.datalist.clear", "id": "<?= $this->getId(); ?>-datalist"},
+            {"key": 3, "type": "message.request", "uri": "{/base}/{/lang}/api/admin/find/account?search={#<?= $this->getId(); ?>}", "method": "GET", "request_type": "json"},
+            {"key": 4, "type": "dom.datalist.append", "id": "<?= $this->getId(); ?>-datalist", "value": "id", "text": "name"}
         ]
     }
 ]' required>
diff --git a/Theme/Backend/Components/AccountGroupSelector/popup.tpl.php b/Theme/Backend/Components/AccountGroupSelector/popup.tpl.php
index c226866..65b0287 100644
--- a/Theme/Backend/Components/AccountGroupSelector/popup.tpl.php
+++ b/Theme/Backend/Components/AccountGroupSelector/popup.tpl.php
@@ -3,42 +3,90 @@
         <header><h1><?= $this->getText('Account/Group', 'Admin'); ?></h1></header>
 
         <div class="inner">
-            <form id="fAccGrp"  method="GET" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/admin/accgrp'); ?>">
-                <table class="layout wf-100">
-                    <tbody>
-                    <tr><td colspan="2"><label for="iSearch">Search</label>
-                    <tr><td><input type="text" id="iSearch" name="receiver-search" data-action='[
-                        {
-                            "listener": "keyup", "action": [
-                                {"type": "utils.timer", "id": "iSearch", "delay": 500, "resets": true},
-                                {"type": "dom.table.clear", "id": "acc-grp-table"},
-                                {"type": "message.request", "uri": "{/base}/{/lang}/api/admin/find/account?search={#iSearch}", "method": "GET", "request_type": "json"},
-                                {"type": "dom.table.append", "id": "acc-grp-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name/0"}, "position": -1}
-                            ]
-                        }
-                    ]' autocomplete="off"><td>
-                    <tr><td colspan="2">
-                        <table id="acc-grp-table" class="table">
-                            <thead>
-                                <tr>
-                                    <th data-name="id">ID
-                                    <th data-name="name">Name
-                                    <th data-name="address">Address
-                                    <th data-name="city">City
-                                    <th data-name="zip">Zip
-                                    <th data-name="country">Country
+        <div class="tabular-2">
+            <div class="box wf-100">
+                <ul class="tab-links">
+                    <li><label for="c-tab-1"><?= $this->getText('Account', 'Admin'); ?></label>
+                    <li><label for="c-tab-2"><?= $this->getText('Group', 'Admin'); ?></label>
+                </ul>
+            </div>
+            <div class="tab-content">
+                <input type="radio" id="c-tab-1" name="tabular-2" checked>
+                <div class="tab">
+                    <form id="fAccSelector"  method="GET" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/admin/accgrp'); ?>">
+                        <table class="layout wf-100">
                             <tbody>
-                            <tfoot>
+                            <tr><td colspan="2"><label for="iSearchAcc">Search</label>
+                            <tr><td><input type="text" id="iSearchAcc" name="receiver-search" data-action='[
+                                {
+                                    "listener": "keyup", "action": [
+                                        {"key": 1, "type": "utils.timer", "id": "iSearchAcc", "delay": 500, "resets": true},
+                                        {"key": 2, "type": "dom.table.clear", "id": "acc-table"},
+                                        {"key": 3, "type": "message.request", "uri": "{/base}/{/lang}/api/admin/find/account?search={#iSearchAcc}", "method": "GET", "request_type": "json"},
+                                        {"key": 4, "type": "dom.table.append", "id": "acc-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name/0"}, "position": -1}
+                                    ]
+                                }
+                            ]' autocomplete="off"><td>
+                            <tr><td colspan="2">
+                                <table id="acc-table" class="table">
+                                    <thead>
+                                        <tr>
+                                            <th data-name="id">ID
+                                            <th data-name="name">Name
+                                            <th data-name="address">Address
+                                            <th data-name="city">City
+                                            <th data-name="zip">Zip
+                                            <th data-name="country">Country
+                                    <tbody>
+                                    <tfoot>
+                                </table>
+                            <tr><td colspan="2"><button type="button" data-action='[
+                                    {
+                                        "listener": "click", "action": [
+                                            {"key": 1, "type": "dom.remove", "tpl": "acc-grp", "aniOut": "fadeOut"}
+                                        ]
+                                    }
+                                ]'><?= $this->getText('Close', 'Admin'); ?></button>
                         </table>
-                    <tr><td colspan="2"><button type="button" data-action='[
-                            {
-                                "listener": "click", "action": [
-                                    {"type": "dom.remove", "tpl": "acc-grp", "aniOut": "fadeOut"}
-                                ]
-                            }
-                        ]'><?= $this->getText('Close', 'Admin'); ?></button>
-                </table>
-            </form>
+                    </form>
+                </div>
+                <input type="radio" id="c-tab-2" name="tabular-2">
+                <div class="tab">
+                <form id="fGrpSelector"  method="GET" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/admin/accgrp'); ?>">
+                        <table class="layout wf-100">
+                            <tbody>
+                            <tr><td colspan="2"><label for="iSearchGrp">Search</label>
+                            <tr><td><input type="text" id="iSearchGrp" name="receiver-search" data-action='[
+                                {
+                                    "listener": "keyup", "action": [
+                                        {"key": 1, "type": "utils.timer", "id": "iSearchGrp", "delay": 500, "resets": true},
+                                        {"key": 2, "type": "dom.table.clear", "id": "grp-table"},
+                                        {"key": 3, "type": "message.request", "uri": "{/base}/{/lang}/api/admin/find/account?search={#iSearchGrp}", "method": "GET", "request_type": "json"},
+                                        {"key": 4, "type": "dom.table.append", "id": "grp-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name/0"}, "position": -1}
+                                    ]
+                                }
+                            ]' autocomplete="off"><td>
+                            <tr><td colspan="2">
+                                <table id="grp-table" class="table">
+                                    <thead>
+                                        <tr>
+                                            <th data-name="id">ID
+                                            <th data-name="name">Name
+                                            <th data-name="parent">Parent
+                                    <tbody>
+                                    <tfoot>
+                                </table>
+                            <tr><td colspan="2"><button type="button" data-action='[
+                                    {
+                                        "listener": "click", "action": [
+                                            {"key": 1, "type": "dom.remove", "tpl": "acc-grp", "aniOut": "fadeOut"}
+                                        ]
+                                    }
+                                ]'><?= $this->getText('Close', 'Admin'); ?></button>
+                        </table>
+                    </form>
+                </div>
+            </div>
         </div>
     </section>
 </template>
\ No newline at end of file