diff --git a/tests/app/forms_table.php b/tests/app/forms_table.php
index b20529d..328c1e1 100644
--- a/tests/app/forms_table.php
+++ b/tests/app/forms_table.php
@@ -1,25 +1,25 @@
 <div class="row">
     <div class="col-xs-12">
         <div class="box wf-100">
-            <table class="table green" id="table1" data-table-form="fSample">
+            <table class="table green" id="table1" data-ui-content="tbody" data-ui-element="tr" data-tag="form" data-ui-form="fSample">
                 <caption>Form Add</caption>
                 <thead>
                 <tr>
                     <td>
                     <td>
-                    <td>Col1 Title<i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i></td>
-                    <td>Col2 Title<i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i></td>
-                    <td>Col3 Title<i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i></td>
-                    <td>Col4 Title<i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i></td>
-                    <td>Col5 Title<i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i></td>
-                    <td>Col6 Title<i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i></td>
+                    <td>Input<i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i></td>
+                    <td>Select<i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i></td>
+                    <td>Textarea<i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i></td>
+                    <td>Date<i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i></td>
+                    <td>Radio<i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i></td>
+                    <td>Checkbox<i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i></td>
                 </tr>
                 </thead>
                 <tbody>
                 <template>
                     <tr>
-                        <td><form id="fRemoveX" method="DELETE"><i class="fa fa-times btn remove submit"></i></form>
-                        <td><i class="fa fa-cogs btn update submit"></i>
+                        <td><i class="fa fa-times btn remove"></i>
+                        <td><i class="fa fa-cogs btn update"></i>
                         <td data-tpl-text="/input" data-tpl-value="/input" data-value=""></td>
                         <td data-tpl-text="/select" data-tpl-value="/select" data-value=""></td>
                         <td data-tpl-text="/text" data-tpl-value="/text" data-value=""></td>
@@ -33,31 +33,31 @@
                     </tr>
                 </template>
                 <tr>
-                    <td><form id="fRemoveX1" method="DELETE"><i class="fa fa-times btn remove submit"></i></form>
-                    <td><i class="fa fa-cogs btn update submit"></i>
-                    <td data-tpl-text="/input" data-tpl-value="/input" data-value="">Col2</td>
-                    <td data-tpl-text="/select" data-tpl-value="/select" data-value="">Col1</td>
-                    <td data-tpl-text="/text" data-tpl-value="/text" data-value="">Col4</td>
+                    <td><i class="fa fa-times btn remove"></i>
+                    <td><i class="fa fa-cogs btn update"></i>
+                    <td data-tpl-text="/input" data-tpl-value="/input" data-value="">Input1</td>
+                    <td data-tpl-text="/select" data-tpl-value="/select" data-value="o1">Option1</td>
+                    <td data-tpl-text="/text" data-tpl-value="/text" data-value="">Text1</td>
                     <td data-tpl-text="/date" data-tpl-value="/date" data-value="">Col3</td>
                     <td data-tpl-text="/radio" data-tpl-value="/radio" data-value="">Col5</td>
                     <td data-tpl-text="/checkbox/c" data-tpl-value="/checkbox/c" data-value="">Col6</td>
                 </tr>
                 <tr>
-                    <td><form id="fRemoveX2" method="DELETE"><i class="fa fa-times btn remove submit"></i></form>
-                    <td><i class="fa fa-cogs btn update submit"></i>
-                    <td data-tpl-text="/input" data-tpl-value="/input" data-value="">Col4</td>
-                    <td data-tpl-text="/select" data-tpl-value="/select" data-value="">Col1</td>
-                    <td data-tpl-text="/text" data-tpl-value="/text" data-value="">Col2</td>
+                    <td><i class="fa fa-times btn remove"></i>
+                    <td><i class="fa fa-cogs btn update"></i>
+                    <td data-tpl-text="/input" data-tpl-value="/input" data-value="">Input2</td>
+                    <td data-tpl-text="/select" data-tpl-value="/select" data-value="o2">Option2</td>
+                    <td data-tpl-text="/text" data-tpl-value="/text" data-value="">Text2</td>
                     <td data-tpl-text="/date" data-tpl-value="/date" data-value="">Col3</td>
                     <td data-tpl-text="/radio" data-tpl-value="/radio" data-value="">Col5</td>
                     <td data-tpl-text="/checkbox/c" data-tpl-value="/checkbox/c" data-value="">Col6</td>
                 </tr>
                 <tr>
-                    <td><form id="fRemoveX3" method="DELETE"><i class="fa fa-times btn remove submit"></i></form>
-                    <td><i class="fa fa-cogs btn update submit"></i>
-                    <td data-tpl-text="/input" data-tpl-value="/input" data-value="">Col1</td>
-                    <td data-tpl-text="/select" data-tpl-value="/select" data-value="">Col2</td>
-                    <td data-tpl-text="/text" data-tpl-value="/text" data-value="">Col3</td>
+                    <td><i class="fa fa-times btn remove"></i>
+                    <td><i class="fa fa-cogs btn update"></i>
+                    <td data-tpl-text="/input" data-tpl-value="/input" data-value="">Input3</td>
+                    <td data-tpl-text="/select" data-tpl-value="/select" data-value="o3">Option3</td>
+                    <td data-tpl-text="/text" data-tpl-value="/text" data-value="">Text3</td>
                     <td data-tpl-text="/date" data-tpl-value="/date" data-value="">Col4</td>
                     <td data-tpl-text="/radio" data-tpl-value="/radio" data-value="">Col5</td>
                     <td data-tpl-text="/checkbox/c" data-tpl-value="/checkbox/c" data-value="">Col6</td>
@@ -139,7 +139,7 @@
 <div class="row">
     <div class="col-xs-12">
         <div class="box wf-100">
-            <table class="table green" id="table2" data-table-add="addButton" data-table-form="fInside">
+            <table class="table green" id="table2" data-ui-content="tbody" data-ui-element="tr" data-tag="form">
                 <caption>Inline Add</caption>
                 <thead>
                 <tr>
@@ -156,8 +156,8 @@
                 <tbody>
                 <template>
                     <tr>
-                        <td><form id="fRemoveY" method="DELETE"><i class="fa fa-times btn remove submit"></i></form>
-                        <td><i class="fa fa-cogs btn update submit"></i>
+                        <td><i class="fa fa-times btn remove"></i>
+                        <td><i class="fa fa-cogs btn update"></i>
                         <td data-tpl-text="/input" data-tpl-value="/input" data-value=""></td>
                         <td data-tpl-text="/select" data-tpl-value="/select" data-value=""></td>
                         <td data-tpl-text="/text" data-tpl-value="/text" data-value=""></td>
@@ -172,8 +172,8 @@
                 </template>
                 <template>
                     <tr>
-                        <td><form id="fRemoveYY" method="DELETE"><i class="fa fa-times btn remove submit"></i></form>
-                        <td><i class="fa fa-cogs btn update submit"></i>
+                        <td><i class="fa fa-times btn remove"></i>
+                        <td><i class="fa fa-cogs btn update"></i>
                         <td><input data-form="fInside" data-tpl-text="/input" data-tpl-value="/input" data-value="" type="text"></td>
                         <td>
                             <select data-form="fInside" data-tpl-text="/select" data-tpl-value="/select" data-value="">
@@ -209,8 +209,8 @@
                     </tr>
                 </template>
                 <tr>
-                    <td><form id="fRemoveY1" method="DELETE"><i class="fa fa-times btn remove submit"></i></form>
-                    <td><i class="fa fa-cogs btn update submit"></i>
+                    <td><i class="fa fa-times btn remove"></i>
+                    <td><i class="fa fa-cogs btn update"></i>
                     <td data-tpl-text="/input" data-tpl-value="/input" data-value="">Col2</td>
                     <td data-tpl-text="/select" data-tpl-value="/select" data-value="">Col1</td>
                     <td data-tpl-text="/text" data-tpl-value="/text" data-value="">Col4</td>
@@ -219,8 +219,8 @@
                     <td data-tpl-text="/checkbox/c" data-tpl-value="/checkbox/c" data-value="">Col6</td>
                 </tr>
                 <tr>
-                    <td><form id="fRemoveY2" method="DELETE"><i class="fa fa-times btn remove submit"></i></form>
-                    <td><i class="fa fa-cogs btn update submit"></i>
+                    <td><i class="fa fa-times btn remove"></i>
+                    <td><i class="fa fa-cogs btn update"></i>
                     <td data-tpl-text="/input" data-tpl-value="/input" data-value="">Col4</td>
                     <td data-tpl-text="/select" data-tpl-value="/select" data-value="">Col1</td>
                     <td data-tpl-text="/text" data-tpl-value="/text" data-value="">Col2</td>
@@ -229,8 +229,8 @@
                     <td data-tpl-text="/checkbox/c" data-tpl-value="/checkbox/c" data-value="">Col6</td>
                 </tr>
                 <tr>
-                    <td><form id="fRemoveY3" method="DELETE"><i class="fa fa-times btn remove submit"></i></form>
-                    <td><i class="fa fa-cogs btn update submit"></i>
+                    <td><i class="fa fa-times btn remove"></i>
+                    <td><i class="fa fa-cogs btn update"></i>
                     <td data-tpl-text="/input" data-tpl-value="/input" data-value="">Col1</td>
                     <td data-tpl-text="/select" data-tpl-value="/select" data-value="">Col2</td>
                     <td data-tpl-text="/text" data-tpl-value="/text" data-value="">Col3</td>
@@ -257,11 +257,19 @@
                             <li>...</li>
                             <li><a href="#">20</a></li>
                         </ul>
-                        <button id="addButton">Add</button>
+                        <button id="addButton" class="add">Add</button>
                     </td>
                 </tr>
                 </tfoot>
             </table>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
+
+<script type="module">
+    import { Request } from '../../../jsOMS/Message/Request/Request.js';
+
+    const loginRequest = new Request('http://127.0.0.1/en/api/login', 'POST', 'json');
+    loginRequest.setData({user: 'admin', pass: 'orange'});
+    loginRequest.send();
+</script>
\ No newline at end of file
diff --git a/tests/app/tables.php b/tests/app/tables.php
index 5c8770c..db2a7df 100644
--- a/tests/app/tables.php
+++ b/tests/app/tables.php
@@ -129,11 +129,10 @@
 <div class="row">
     <div class="col-xs-12">
         <div class="box wf-100">
-            <table id="tRemovable" class="table darkred">
+            <table id="tRemovable" class="table darkred" data-ui-element="tr" data-tag="form">
                 <caption>Table Title</caption>
                 <thead>
                 <tr>
-                    <td></td>
                     <td></td>
                     <td>Col1 Title</td>
                     <td>Col2 Title</td>
@@ -143,32 +142,28 @@
                 </thead>
                 <tbody>
                 <tr>
-                    <td><form id="fR1" method="NONE"><i class="fa fa-times btn remove submit"></i></form>
-                    <td><i class="fa fa-cogs btn update submit"></i>
+                    <td><i class="fa fa-times btn remove"></i>
                     <td>Col1</td>
                     <td>Col2</td>
                     <td>Col3</td>
                     <td>Col4</td>
                 </tr>
                 <tr>
-                    <td><form id="fR2" method="NONE"><i class="fa fa-times btn remove submit"></i></form>
-                    <td><i class="fa fa-cogs btn update submit"></i>
+                    <td><i class="fa fa-times btn remove"></i>
                     <td>Col2</td>
                     <td>Col2</td>
                     <td>Col3</td>
                     <td>Col4</td>
                 </tr>
                 <tr>
-                    <td><form id="fR3" method="NONE"><i class="fa fa-times btn remove submit"></i></form>
-                    <td><i class="fa fa-cogs btn update submit"></i>
+                    <td><i class="fa fa-times btn remove"></i>
                     <td>Col3</td>
                     <td>Col2</td>
                     <td>Col3</td>
                     <td>Col4</td>
                 </tr>
                 <tr>
-                    <td><form id="fR4" method="NONE"><i class="fa fa-times btn remove submit"></i></form>
-                    <td><i class="fa fa-cogs btn update submit"></i>
+                    <td><i class="fa fa-times btn remove"></i>
                     <td>Col4</td>
                     <td>Col2</td>
                     <td>Col3</td>
@@ -204,11 +199,10 @@
 <div class="row">
     <div class="col-xs-12">
         <div class="box wf-100">
-            <table class="table green" id="table3" data-src="http://127.0.0.1/en/api/admin/find/account?search=do">
+            <table class="table green" id="table3" data-src="http://127.0.0.1/en/api/admin/find/account?search=do" data-ui-element="tr">
                 <caption>Remote Data</caption>
                 <thead>
                     <tr>
-                        <td>
                         <td>
                         <td data-name=""><i class="filter fa fa-filter"></i>ID<i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i></td>
                         <td data-name=""><i class="filter fa fa-filter"></i>Name<i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i></td>
@@ -216,8 +210,7 @@
                 <tbody>
                     <template id="input2-rowElement" class="rowTemplate">
                         <tr tabindex="-1">
-                            <td><form id="fRemove" method="NONE"><i class="fa fa-times btn remove"></i></form>
-                            <td><form id="fUpdate" method="NONE"><i class="fa fa-cogs btn update"></i></form>
+                            <td><i class="fa fa-times btn remove"></i>
                             <td data-tpl-text="/id" data-tpl-value="/id" data-value="">s</td>
                             <td data-tpl-text="/name/0" data-tpl-value="/name/0" data-value=""></td>
                             <td data-tpl-text="/email"></td>