diff --git a/Theme/Backend/department-create.tpl.php b/Theme/Backend/department-create.tpl.php
index adbfc9e..7935aca 100755
--- a/Theme/Backend/department-create.tpl.php
+++ b/Theme/Backend/department-create.tpl.php
@@ -26,17 +26,27 @@ echo $this->data['nav']->render(); ?>
                 autocomplete="off">
                 <div class="portlet-head"><?= $this->getHtml('Department'); ?></div>
                 <div class="portlet-body">
-                    <table class="layout wf-100" style="table-layout: fixed">
-                        <tr><td><label for="iName"><?= $this->getHtml('Name'); ?></label>
-                        <tr><td><input type="text" name="name" id="iName" required>
-                        <tr><td><label for="iParent"><?= $this->getHtml('Parent'); ?></label>
-                        <tr><td><?= $this->getData('department-selector')->render('iParent', 'parent', false); ?>
-                        <tr><td><label for="iUnit"><?= $this->getHtml('Unit'); ?></label>
-                        <tr><td><?= $this->getData('unit-selector')->render('iUnit', 'unit', false); ?>
-                        <tr><td><label for="iDescription"><?= $this->getHtml('Description'); ?></label>
-                        <tr><td><?= $this->getData('editor')->render('department-editor'); ?>
-                        <tr><td><?= $this->getData('editor')->getData('text')->render('department-editor', 'description', 'fDepartmentCreate'); ?>
-                    </table>
+                    <div class="form-group">
+                        <label for="iName"><?= $this->getHtml('Name'); ?></label>
+                        <input type="text" name="name" id="iName" required>
+                    </div>
+
+                    <div class="form-group">
+                        <label for="iParent"><?= $this->getHtml('Parent'); ?></label>
+                        <?= $this->getData('department-selector')->render('iParent', 'parent', false); ?>
+                    </div>
+
+                    <div class="form-group">
+                        <label for="iUnit"><?= $this->getHtml('Unit'); ?></label>
+                        <?= $this->getData('unit-selector')->render('iUnit', 'unit', false); ?>
+                    </div>
+
+                    <div class="form-group">
+                        <label for="iDescription"><?= $this->getHtml('Description'); ?></label>
+                        <?= $this->getData('editor')->render('department-editor'); ?>
+                    </div>
+
+                    <?= $this->getData('editor')->getData('text')->render('department-editor', 'description', 'fDepartmentCreate'); ?>
                 </div>
                 <div class="portlet-foot">
                     <input id="iSubmit" name="submit" type="submit" value="<?= $this->getHtml('Create', '0', '0'); ?>">
diff --git a/Theme/Backend/department-view.tpl.php b/Theme/Backend/department-view.tpl.php
index e770e3f..abe4731 100644
--- a/Theme/Backend/department-view.tpl.php
+++ b/Theme/Backend/department-view.tpl.php
@@ -28,27 +28,40 @@ echo $this->data['nav']->render(); ?>
             <form id="iDepartment" action="<?= UriFactory::build('{/api}organization/department?{?}'); ?>" method="POST">
                 <div class="portlet-head"><?= $this->getHtml('Department'); ?></div>
                 <div class="portlet-body">
-                    <table class="layout wf-100" style="table-layout: fixed">
-                        <tr><td><label for="iName"><?= $this->getHtml('Name'); ?></label>
-                        <tr><td><input type="text" name="name" id="iName" value="<?= $this->printHtml($department->name); ?>">
-                        <tr><td><label for="iParent"><?= $this->getHtml('Parent'); ?></label>
-                        <tr><td><?= $this->getData('department-selector')->render('iParent', 'parent', false); ?>
-                        <tr><td><label for="iUnit"><?= $this->getHtml('Unit'); ?></label>
-                        <tr><td><?= $this->getData('unit-selector')->render('iUnit', 'unit', false); ?>
-                        <tr><td><label for="iStatus"><?= $this->getHtml('Status'); ?></label>
-                        <tr><td><select name="status" id="iStatus">
-                                    <option><?= $this->getHtml('Active'); ?>
-                                    <option><?= $this->getHtml('Inactive'); ?>
-                                </select>
-                        <tr><td><?= $this->getData('editor')->render('department-editor'); ?>
-                        <tr><td><?= $this->getData('editor')->getData('text')->render(
-                            'department-editor',
-                            'description',
-                            'iDepartment',
-                            $department->descriptionRaw,
-                            $department->description
-                        ); ?>
-                    </table>
+                    <div class="form-group">
+                        <label for="iName"><?= $this->getHtml('Name'); ?></label>
+                        <input type="text" name="name" id="iName" value="<?= $this->printHtml($department->name); ?>">
+                    </div>
+
+                    <div class="form-group">
+                        <label for="iParent"><?= $this->getHtml('Parent'); ?></label>
+                        <?= $this->getData('department-selector')->render('iParent', 'parent', false); ?>
+                    </div>
+
+                    <div class="form-group">
+                        <label for="iUnit"><?= $this->getHtml('Unit'); ?></label>
+                        <?= $this->getData('unit-selector')->render('iUnit', 'unit', false); ?>
+                    </div>
+
+                    <div class="form-group">
+                        <label for="iStatus"><?= $this->getHtml('Status'); ?></label>
+                        <select name="status" id="iStatus">
+                            <option><?= $this->getHtml('Active'); ?>
+                            <option><?= $this->getHtml('Inactive'); ?>
+                        </select>
+                    </div>
+
+                    <div class="form-group">
+                        <?= $this->getData('editor')->render('department-editor'); ?>
+                    </div>
+
+                    <?= $this->getData('editor')->getData('text')->render(
+                        'department-editor',
+                        'description',
+                        'iDepartment',
+                        $department->descriptionRaw,
+                        $department->description
+                    ); ?>
                 </div>
                 <div class="portlet-foot">
                     <input id="iSubmit" name="submit" type="submit" value="<?= $this->getHtml('Save', '0', '0'); ?>">
diff --git a/Theme/Backend/position-create.tpl.php b/Theme/Backend/position-create.tpl.php
index 6445e23..51d473a 100755
--- a/Theme/Backend/position-create.tpl.php
+++ b/Theme/Backend/position-create.tpl.php
@@ -27,21 +27,34 @@ echo $this->data['nav']->render(); ?>
                 autocomplete="off">
                 <div class="portlet-head"><?= $this->getHtml('Position'); ?></div>
                 <div class="portlet-body">
-                    <table class="layout wf-100" style="table-layout: fixed">
-                        <tr><td><label for="iName"><?= $this->getHtml('Name'); ?></label>
-                        <tr><td><input type="text" name="name" id="iName" required>
-                        <tr><td><label for="iParent"><?= $this->getHtml('Parent'); ?></label>
-                        <tr><td><?= $this->getData('position-selector')->render('iParent', 'parent', false); ?>
-                        <tr><td><label for="iDepartment"><?= $this->getHtml('Department'); ?></label>
-                        <tr><td><?= $this->getData('department-selector')->render('iDepartment', 'department', false); ?>
-                        <tr><td><label for="iStatus"><?= $this->getHtml('Status'); ?></label>
-                        <tr><td><select name="status" id="iStatus">
-                                    <option value="<?= Status::ACTIVE; ?>"><?= $this->getHtml('Active'); ?>
-                                    <option value="<?= Status::INACTIVE; ?>"><?= $this->getHtml('Inactive'); ?>
-                                    </select>
-                        <tr><td><?= $this->getData('editor')->render('position-editor'); ?>
-                        <tr><td><?= $this->getData('editor')->getData('text')->render('position-editor', 'description', 'fPositionCreate'); ?>
-                    </table>
+                    <div class="form-group">
+                        <label for="iName"><?= $this->getHtml('Name'); ?></label>
+                        <input type="text" name="name" id="iName" required>
+                    </div>
+
+                    <div class="form-group">
+                        <label for="iParent"><?= $this->getHtml('Parent'); ?></label>
+                        <?= $this->getData('position-selector')->render('iParent', 'parent', false); ?>
+                    </div>
+
+                    <div class="form-group">
+                        <label for="iDepartment"><?= $this->getHtml('Department'); ?></label>
+                        <?= $this->getData('department-selector')->render('iDepartment', 'department', false); ?>
+                    </div>
+
+                    <div class="form-group">
+                        <label for="iStatus"><?= $this->getHtml('Status'); ?></label>
+                        <select name="status" id="iStatus">
+                            <option value="<?= Status::ACTIVE; ?>"><?= $this->getHtml('Active'); ?>
+                            <option value="<?= Status::INACTIVE; ?>"><?= $this->getHtml('Inactive'); ?>
+                        </select>
+                    </div>
+
+                    <div class="form-group">
+                        <?= $this->getData('editor')->render('position-editor'); ?>
+                    </div>
+
+                    <?= $this->getData('editor')->getData('text')->render('position-editor', 'description', 'fPositionCreate'); ?>
                 </div>
                 <div class="portlet-foot">
                     <input id="iSubmit" name="submit" type="submit" value="<?= $this->getHtml('Create', '0', '0'); ?>">
diff --git a/Theme/Backend/position-view.tpl.php b/Theme/Backend/position-view.tpl.php
index 29ae221..5e4c39b 100644
--- a/Theme/Backend/position-view.tpl.php
+++ b/Theme/Backend/position-view.tpl.php
@@ -28,27 +28,40 @@ echo $this->data['nav']->render(); ?>
             <form id="iPosition" action="<?= UriFactory::build('{/api}organization/position?{?}'); ?>" method="POST">
                 <div class="portlet-head"><?= $this->getHtml('Position'); ?></div>
                 <div class="portlet-body">
-                    <table class="layout wf-100" style="table-layout: fixed">
-                        <tr><td><label for="iName"><?= $this->getHtml('Name'); ?></label>
-                        <tr><td><input type="text" name="name" id="iName" value="<?= $this->printHtml($position->name); ?>">
-                        <tr><td><label for="iParent"><?= $this->getHtml('Parent'); ?></label>
-                        <tr><td><?= $this->getData('position-selector')->render('iParent', 'parent', false); ?>
-                        <tr><td><label for="iDepartment"><?= $this->getHtml('Department'); ?></label>
-                        <tr><td><?= $this->getData('department-selector')->render('iDepartment', 'department', false); ?>
-                        <tr><td><label for="iStatus"><?= $this->getHtml('Status'); ?></label>
-                        <tr><td><select name="status" id="iStatus">
-                                    <option><?= $this->getHtml('Active'); ?>
-                                    <option><?= $this->getHtml('Inactive'); ?>
-                                </select>
-                        <tr><td><?= $this->getData('editor')->render('position-editor'); ?>
-                        <tr><td><?= $this->getData('editor')->getData('text')->render(
-                            'position-editor',
-                            'description',
-                            'iPosition',
-                            $position->descriptionRaw,
-                            $position->description
-                        ); ?>
-                    </table>
+                    <div class="form-group">
+                        <label for="iName"><?= $this->getHtml('Name'); ?></label>
+                        <input type="text" name="name" id="iName" value="<?= $this->printHtml($position->name); ?>">
+                    </div>
+
+                    <div class="form-group">
+                        <label for="iParent"><?= $this->getHtml('Parent'); ?></label>
+                        <?= $this->getData('position-selector')->render('iParent', 'parent', false); ?>
+                    </div>
+
+                    <div class="form-group">
+                        <label for="iDepartment"><?= $this->getHtml('Department'); ?></label>
+                        <?= $this->getData('department-selector')->render('iDepartment', 'department', false); ?>
+                    </div>
+
+                    <div class="form-group">
+                        <label for="iStatus"><?= $this->getHtml('Status'); ?></label>
+                        <select name="status" id="iStatus">
+                            <option><?= $this->getHtml('Active'); ?>
+                            <option><?= $this->getHtml('Inactive'); ?>
+                        </select>
+                    </div>
+
+                    <div class="form-group">
+                        <?= $this->getData('editor')->render('position-editor'); ?>
+                    </div>
+
+                    <?= $this->getData('editor')->getData('text')->render(
+                        'position-editor',
+                        'description',
+                        'iPosition',
+                        $position->descriptionRaw,
+                        $position->description
+                    ); ?>
                 </div>
                 <div class="portlet-foot">
                     <input id="iSubmit" name="submit" type="submit" value="<?= $this->getHtml('Save', '0', '0'); ?>">
diff --git a/Theme/Backend/unit-create.tpl.php b/Theme/Backend/unit-create.tpl.php
index 97b005c..428bc2b 100755
--- a/Theme/Backend/unit-create.tpl.php
+++ b/Theme/Backend/unit-create.tpl.php
@@ -47,7 +47,10 @@ echo $this->data['nav']->render(); ?>
                         </select>
                     </div>
 
-                    <?= $this->getData('editor')->render('unit-editor'); ?>
+                    <div class="form-group">
+                        <?= $this->getData('editor')->render('unit-editor'); ?>
+                    </div>
+
                     <?= $this->getData('editor')->getData('text')->render('unit-editor', 'description', 'fUnitCreate'); ?>
                 </div>
                 <div class="portlet-foot">
diff --git a/Theme/Backend/unit-view.tpl.php b/Theme/Backend/unit-view.tpl.php
index 1dd01ab..0a0789e 100644
--- a/Theme/Backend/unit-view.tpl.php
+++ b/Theme/Backend/unit-view.tpl.php
@@ -68,7 +68,9 @@ echo $this->data['nav']->render(); ?>
                         </select>
                     </div>
 
-                    <?= $this->getData('editor')->render('unit-editor'); ?>
+                    <div class="form-group">
+                        <?= $this->getData('editor')->render('unit-editor'); ?>
+                    </div>
 
                     <?= $this->getData('editor')->getData('text')->render(
                         'unit-editor',