diff --git a/button.scss b/button.scss
index ef49174..2a4d13f 100644
--- a/button.scss
+++ b/button.scss
@@ -1,5 +1,3 @@
-
-
 .btn {
     cursor: pointer;
     user-select: none;
@@ -56,10 +54,10 @@ button.cancel, .button.cancel {
 
 button.close, .button.close {
     color: rgba(0, 0, 0, 0.75);
-    background: #f1ff70;
+    background: #fffc3e;
 
     &:hover, &:focus {
-        background: #faffa1;
+        background: #fffd7b;
     }
 }
 
diff --git a/draggable.scss b/draggable.scss
index e11ad5b..7748793 100644
--- a/draggable.scss
+++ b/draggable.scss
@@ -1,3 +1,7 @@
 *[draggable] {
     cursor: move;
-}
\ No newline at end of file
+}
+
+.drag-placeholder, .drag-placeholder td {
+    border: 2px dashed rgba(0, 0, 0, 0.5) !important;
+}
diff --git a/input.scss b/input.scss
index e3153c3..b63e55d 100644
--- a/input.scss
+++ b/input.scss
@@ -1,13 +1,3 @@
-/**
- * @todo Orange-Management/cssOMS#4
- *  Nicer visual input validation
- *
- * @todo Orange-Management/cssOMS#14
- *  Create drop down with search field
- *
- * @todo Orange-Management/cssOMS#12
- *  Create slider element
- */
 input, select, textarea, .textarea {
     border: 1px solid var(--input-border);
 
@@ -291,7 +281,7 @@ textarea, .textarea {
 }
 
 label.radio, label.checkbox {
-    display: flex;
+    display: inline-flex;
     align-items: center;
     -webkit-user-select: none;
     -moz-user-select: none;
diff --git a/styles.css b/styles.css
index ce36d57..d0af3d0 100644
--- a/styles.css
+++ b/styles.css
@@ -199,7 +199,7 @@ iframe {
   overflow: auto; }
 
 .hidden {
-  display: none; }
+  display: none !important; }
 
 /*!
  * animate.css -http://daneden.me/animate
@@ -3256,6 +3256,9 @@ article {
 *[draggable] {
   cursor: move; }
 
+.drag-placeholder, .drag-placeholder td {
+  border: 2px dashed rgba(0, 0, 0, 0.5) !important; }
+
 p {
   margin: 0 0 10px 0;
   line-height: 1.4em; }
@@ -3482,16 +3485,6 @@ img.rounded {
 img.bordered {
   border: 1px solid var(--box-border); }
 
-/**
- * @todo Orange-Management/cssOMS#4
- *  Nicer visual input validation
- *
- * @todo Orange-Management/cssOMS#14
- *  Create drop down with search field
- *
- * @todo Orange-Management/cssOMS#12
- *  Create slider element
- */
 input, select, textarea, .textarea {
   border: 1px solid var(--input-border); }
   input.undecorated, select.undecorated, textarea.undecorated, .textarea.undecorated {
@@ -3733,7 +3726,7 @@ textarea, .textarea {
   font-family: Consolas, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace; }
 
 label.radio, label.checkbox {
-  display: flex;
+  display: inline-flex;
   align-items: center;
   -webkit-user-select: none;
   -moz-user-select: none;
@@ -4157,9 +4150,9 @@ button.cancel, .button.cancel {
 
 button.close, .button.close {
   color: rgba(0, 0, 0, 0.75);
-  background: #f1ff70; }
+  background: #fffc3e; }
   button.close:hover, button.close:focus, .button.close:hover, .button.close:focus {
-    background: #faffa1; }
+    background: #fffd7b; }
 
 button.disabled, .button.disabled {
   color: rgba(0, 0, 0, 0.5);
@@ -4631,9 +4624,6 @@ section > h2 {
 table.fixed {
   table-layout: fixed; }
 
-table.default tbody tr.drag-placeholder td {
-  border: 2px dashed rgba(0, 0, 0, 0.5) !important; }
-
 table:not([id]) > thead .sort-asc, table:not([id]) > thead .sort-desc {
   display: none; }
 
diff --git a/table.scss b/table.scss
index 7f719f3..4829112 100644
--- a/table.scss
+++ b/table.scss
@@ -2,10 +2,6 @@ table.fixed {
     table-layout: fixed;
 }
 
-table.default tbody tr.drag-placeholder td {
-    border: 2px dashed rgba(0, 0, 0, 0.5) !important;
-}
-
 table:not([id]) > thead .sort-asc, table:not([id]) > thead .sort-desc {
     display: none;
 }
@@ -28,7 +24,6 @@ table input[type=radio]:checked + i {
     color: var(--button-colored-background);
 }
 
-// @todo: check!!!!
 table input[type=checkbox]:checked + label i {
     color: var(--button-colored-background);
 }
diff --git a/tests/app/forms_input.php b/tests/app/forms_input.php
index ce16e8e..efe205d 100644
--- a/tests/app/forms_input.php
+++ b/tests/app/forms_input.php
@@ -58,7 +58,7 @@
 <script type="module">
     import { Request } from "../../../jsOMS/Message/Request/Request.js";
 
-    const loginRequest = new HttpRequest('http://127.0.0.1/en/api/login', 'POST', 'json');
+    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/forms_table.php b/tests/app/forms_table.php
index d8e4c66..f71cbeb 100644
--- a/tests/app/forms_table.php
+++ b/tests/app/forms_table.php
@@ -44,9 +44,11 @@
                     </thead>
                     <tbody>
                     <template>
-                        <tr>
-                            <td><i class="fa fa-times btn remove"></i>
-                                <i class="fa fa-cogs btn update"></i>
+                        <tr draggable="true">
+                            <td><i class="fa fa-times btn remove-form"></i>
+                                <i class="fa fa-cogs btn update-form"></i>
+                                <i class="fa fa-chevron-up order-up"></i>
+                                <i class="fa fa-chevron-down order-down"></i>
                             <td><label class="checkbox" for="itable1--">
                                     <input type="checkbox" id="itable1--" name="itable1-select">
                                     <span class="checkmark"></span>
@@ -58,14 +60,12 @@
                             <td data-tpl-text="/radio" data-tpl-value="/radio" data-value=""></td>
                             <td>
                                 <span data-tpl-text="/checkbox" data-tpl-value="/checkbox" data-value=""><span>
-                                <span data-tpl-text="/checkbox" data-tpl-value="/checkbox" data-value=""><span>
-                                <span data-tpl-text="/checkbox" data-tpl-value="/checkbox" data-value=""><span>
                             </td>
                         </tr>
                     </template>
                     <tr draggable="true">
-                        <td><i class="fa fa-times btn remove"></i>
-                            <i class="fa fa-cogs btn update"></i>
+                        <td><i class="fa fa-times btn remove-form"></i>
+                            <i class="fa fa-cogs btn update-form"></i>
                             <i class="fa fa-chevron-up order-up"></i>
                             <i class="fa fa-chevron-down order-down"></i>
                         <td><?php include __DIR__ . '/helper/checkbox.tpl.php'; ?>
@@ -73,12 +73,12 @@
                         <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="">2020-10-13</td>
-                        <td data-tpl-text="/radio" data-tpl-value="/radio" data-value="r1">R1</td>
+                        <td data-tpl-text="/radio" data-tpl-value="/radio" data-value="r1">Radio1</td>
                         <td data-tpl-text="/checkbox" data-tpl-value="/checkbox" data-value="CREATE">Create</td>
                     </tr>
                     <tr draggable="true">
-                        <td><i class="fa fa-times btn remove"></i>
-                            <i class="fa fa-cogs btn update"></i>
+                        <td><i class="fa fa-times btn remove-form"></i>
+                            <i class="fa fa-cogs btn update-form"></i>
                             <i class="fa fa-chevron-up order-up"></i>
                             <i class="fa fa-chevron-down order-down"></i>
                         <td><?php include __DIR__ . '/helper/checkbox.tpl.php'; ?>
@@ -86,12 +86,12 @@
                         <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="Hidden Text">Text2</td>
                         <td data-tpl-text="/date" data-tpl-value="/date" data-value="1999-02-03">2021-12-22</td>
-                        <td data-tpl-text="/radio" data-tpl-value="/radio" data-value="r2">R2</td>
-                        <td data-tpl-text="/checkbox" data-tpl-value="/checkbox" data-value="READ">Read</td>
+                        <td data-tpl-text="/radio" data-tpl-value="/radio" data-value="r2">Radio2</td>
+                        <td data-tpl-text="/checkbox" data-tpl-value="/checkbox" data-value="READ,CREATE">Read,Create</td>
                     </tr>
                     <tr draggable="true">
-                        <td><i class="fa fa-times btn remove"></i>
-                            <i class="fa fa-cogs btn update"></i>
+                        <td><i class="fa fa-times btn remove-form"></i>
+                            <i class="fa fa-cogs btn update-form"></i>
                             <i class="fa fa-chevron-up order-up"></i>
                             <i class="fa fa-chevron-down order-down"></i>
                         <td><?php include __DIR__ . '/helper/checkbox.tpl.php'; ?>
@@ -99,12 +99,12 @@
                         <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="">1989-04-28</td>
-                        <td data-tpl-text="/radio" data-tpl-value="/radio" data-value="r3">R3</td>
+                        <td data-tpl-text="/radio" data-tpl-value="/radio" data-value="r3">Radio3</td>
                         <td data-tpl-text="/checkbox" data-tpl-value="/checkbox" data-value="MODIFY">Modify</td>
                     </tr>
                     <tr draggable="true">
-                        <td><i class="fa fa-times btn remove"></i>
-                            <i class="fa fa-cogs btn update"></i>
+                        <td><i class="fa fa-times btn remove-form"></i>
+                            <i class="fa fa-cogs btn update-form"></i>
                             <i class="fa fa-chevron-up order-up"></i>
                             <i class="fa fa-chevron-down order-down"></i>
                         <td><?php include __DIR__ . '/helper/checkbox.tpl.php'; ?>
@@ -112,7 +112,7 @@
                         <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="">Text4</td>
                         <td data-tpl-text="/date" data-tpl-value="/date" data-value="">2025-07-04</td>
-                        <td data-tpl-text="/radio" data-tpl-value="/radio" data-value="r2">R2</td>
+                        <td data-tpl-text="/radio" data-tpl-value="/radio" data-value="r2">Radio2</td>
                         <td data-tpl-text="/checkbox" data-tpl-value="/checkbox" data-value="CREATE,MODIFY">Create,Modify</td>
                     </tr>
                     </tbody>
@@ -125,11 +125,14 @@
 <div class="row">
     <div class="col-xs-12">
         <section class="portlet">
-            <form id="fSample" action="api/test" method="put">
+            <form id="fSample" action="api/test" method="put"
+                data-add-content="#table1 tbody"
+                data-add-element="tr"
+                data-add-tpl="#table1 tbody template">
                 <div class="portlet-body">
                     <div class="form-group">
                         <label for="iInput">Input</label>
-                        <input id="iInput" name="input" type="text" data-tpl-text="/input" data-tpl-value="/input">
+                        <input id="iInput" name="input" type="text" data-tpl-text="/input" data-tpl-value="/input" required>
                     </div>
 
                     <div class="form-group">
@@ -199,10 +202,12 @@
                         </div>
                     </div>
                 </div>
+                <div class="portlet-foot">
+                    <input type="submit" class="add-form" value="Add">
+                    <input type="submit" class="save-form hidden button save" value="Update">
+                    <input type="submit" class="cancel-form hidden button close" value="Cancel">
+                </div>
             </form>
-            <div class="portlet-foot">
-                <input type="submit" value="Add">
-            </div>
         </section>
     </div>
 </div>
@@ -211,7 +216,7 @@
     <div class="col-xs-12">
         <div class="portlet">
             <div class="portlet-head">
-                Inline Eddit
+                Inline Edit
                 <?php include __DIR__ . '/helper/additional-functions.tpl.php'; ?>
                 <?php include __DIR__ . '/helper/export-data.tpl.php'; ?>
             </div>
@@ -245,8 +250,8 @@
                     <tbody>
                     <template>
                         <tr>
-                            <td><i class="fa fa-times btn remove"></i>
-                                <i class="fa fa-cogs btn update"></i>
+                            <td><i class="fa fa-times btn remove-form"></i>
+                                <i class="fa fa-cogs btn update-form"></i>
                             <td><label class="checkbox" for="itable2--">
                                 <input type="checkbox" id="itable2--" name="itable2-select">
                                 <span class="checkmark"></span>
@@ -264,8 +269,8 @@
                     </template>
                     <template>
                         <tr>
-                            <td><i class="fa fa-times btn remove"></i>
-                                <i class="fa fa-cogs btn update"></i>
+                            <td><i class="fa fa-times btn remove-form"></i>
+                                <i class="fa fa-cogs btn update-form"></i>
                             <td><label class="checkbox" for="itable2--">
                                 <input type="checkbox" id="itable2--" name="itable2-select">
                                 <span class="checkmark"></span>
@@ -305,8 +310,8 @@
                         </tr>
                     </template>
                     <tr>
-                        <td><i class="fa fa-times btn remove"></i>
-                            <i class="fa fa-cogs btn update"></i>
+                        <td><i class="fa fa-times btn remove-form"></i>
+                            <i class="fa fa-cogs btn update-form"></i>
                             <i class="fa fa-chevron-up order-up"></i>
                             <i class="fa fa-chevron-down order-down"></i>
                         <td><?php include __DIR__ . '/helper/checkbox.tpl.php'; ?>
@@ -318,8 +323,8 @@
                         <td data-tpl-text="/checkbox" data-tpl-value="/checkbox" data-value="">Col6</td>
                     </tr>
                     <tr>
-                        <td><i class="fa fa-times btn remove"></i>
-                            <i class="fa fa-cogs btn update"></i>
+                        <td><i class="fa fa-times btn remove-form"></i>
+                            <i class="fa fa-cogs btn update-form"></i>
                             <i class="fa fa-chevron-up order-up"></i>
                             <i class="fa fa-chevron-down order-down"></i>
                         <td><?php include __DIR__ . '/helper/checkbox.tpl.php'; ?>
@@ -331,8 +336,8 @@
                         <td data-tpl-text="/checkbox" data-tpl-value="/checkbox" data-value="">Col6</td>
                     </tr>
                     <tr>
-                        <td><i class="fa fa-times btn remove"></i>
-                            <i class="fa fa-cogs btn update"></i>
+                        <td><i class="fa fa-times btn remove-form"></i>
+                            <i class="fa fa-cogs btn update-form"></i>
                             <i class="fa fa-chevron-up order-up"></i>
                             <i class="fa fa-chevron-down order-down"></i>
                         <td><?php include __DIR__ . '/helper/checkbox.tpl.php'; ?>
diff --git a/tests/app/tables.php b/tests/app/tables.php
index 36fc443..07a6748 100644
--- a/tests/app/tables.php
+++ b/tests/app/tables.php
@@ -242,7 +242,7 @@
     import { Request } from '../../../jsOMS/Message/Request/Request.js';
     import { Table } from '../../../jsOMS/UI/Component/Table.js';
 
-    const loginRequest = new HttpRequest('http://127.0.0.1/en/api/login', 'POST', 'json');
+    const loginRequest = new Request('http://127.0.0.1/en/api/login', 'POST', 'json');
     loginRequest.setData({user: 'admin', pass: 'orange'});
     loginRequest.send();
 
diff --git a/visibility.scss b/visibility.scss
index dd0e421..635d6ed 100644
--- a/visibility.scss
+++ b/visibility.scss
@@ -1,3 +1,3 @@
 .hidden {
-    display: none;
+    display: none !important;
 }