diff --git a/Models/Employee.php b/Models/Employee.php
index b4ca280..e869e0b 100755
--- a/Models/Employee.php
+++ b/Models/Employee.php
@@ -28,7 +28,7 @@ use phpOMS\Contract\ArrayableInterface;
  * @link    https://orange-management.org
  * @since   1.0.0
  */
-class Employee implements ArrayableInterface, \JsonSerializable
+class Employee implements \JsonSerializable, ArrayableInterface
 {
     /**
      * Employee ID.
diff --git a/Models/EmployeeActivityStatus.php b/Models/EmployeeActivityStatus.php
index ae01fab..d9dc39c 100755
--- a/Models/EmployeeActivityStatus.php
+++ b/Models/EmployeeActivityStatus.php
@@ -27,5 +27,6 @@ use phpOMS\Stdlib\Base\Enum;
 abstract class EmployeeActivityStatus extends Enum
 {
     public const ACTIVE   = 1;
+
     public const INACTIVE = 2;
 }
diff --git a/Models/EmployeeEducationHistory.php b/Models/EmployeeEducationHistory.php
index 052ce37..c9af187 100755
--- a/Models/EmployeeEducationHistory.php
+++ b/Models/EmployeeEducationHistory.php
@@ -24,7 +24,7 @@ use phpOMS\Contract\ArrayableInterface;
  * @link    https://orange-management.org
  * @since   1.0.0
  */
-class EmployeeEducationHistory implements ArrayableInterface, \JsonSerializable
+class EmployeeEducationHistory implements \JsonSerializable, ArrayableInterface
 {
     /**
      * ID.
diff --git a/Models/EmployeeHistory.php b/Models/EmployeeHistory.php
index ee94b2f..4190a7c 100755
--- a/Models/EmployeeHistory.php
+++ b/Models/EmployeeHistory.php
@@ -31,7 +31,7 @@ use phpOMS\Contract\ArrayableInterface;
  * @link    https://orange-management.org
  * @since   1.0.0
  */
-class EmployeeHistory implements ArrayableInterface, \JsonSerializable
+class EmployeeHistory implements \JsonSerializable, ArrayableInterface
 {
     /**
      * ID.
diff --git a/Models/EmployeeWorkHistory.php b/Models/EmployeeWorkHistory.php
index b6be8cc..f5c1f26 100755
--- a/Models/EmployeeWorkHistory.php
+++ b/Models/EmployeeWorkHistory.php
@@ -24,7 +24,7 @@ use phpOMS\Contract\ArrayableInterface;
  * @link    https://orange-management.org
  * @since   1.0.0
  */
-class EmployeeWorkHistory implements ArrayableInterface, \JsonSerializable
+class EmployeeWorkHistory implements \JsonSerializable, ArrayableInterface
 {
     /**
      * ID.
diff --git a/Models/PermissionState.php b/Models/PermissionState.php
index a814db3..d7579e8 100755
--- a/Models/PermissionState.php
+++ b/Models/PermissionState.php
@@ -27,5 +27,6 @@ use phpOMS\Stdlib\Base\Enum;
 abstract class PermissionState extends Enum
 {
     public const HR         = 1;
+
     public const DEPARTMENT = 2;
 }
diff --git a/Theme/Backend/department-list.tpl.php b/Theme/Backend/department-list.tpl.php
index ea2ade4..4a50f3d 100755
--- a/Theme/Backend/department-list.tpl.php
+++ b/Theme/Backend/department-list.tpl.php
@@ -30,22 +30,22 @@ echo $this->getData('nav')->render(); ?>
 <div class="row">
     <div class="col-xs-12">
         <div class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Departments') ?><i class="fa fa-download floatRight download btn"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Departments'); ?><i class="fa fa-download floatRight download btn"></i></div>
             <table class="default">
                 <thead>
                 <tr>
                     <td><?= $this->getHtml('ID', '0', '0'); ?>
-                    <td class="wf-100"><?= $this->getHtml('Name') ?>
-                    <td><?= $this->getHtml('Employees') ?>
-                    <td><?= $this->getHtml('Parent') ?>
+                    <td class="wf-100"><?= $this->getHtml('Name'); ?>
+                    <td><?= $this->getHtml('Employees'); ?>
+                    <td><?= $this->getHtml('Parent'); ?>
                 <tbody>
                 <?php $c = 0; foreach ($departments as $key => $value) : ++$c;
                 $url = \phpOMS\Uri\UriFactory::build('{/prefix}hr/department/single?{?}&id=' . $value->getId()); ?>
                 <tr tabindex="0" data-href="<?= $url; ?>">
-                    <td data-label="<?= $this->getHtml('ID', '0', '0') ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
-                    <td data-label="<?= $this->getHtml('Name') ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getName()); ?></a>
-                    <td data-label="<?= $this->getHtml('Employees') ?>">
-                    <td data-label="<?= $this->getHtml('Parent') ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getParent()->getName()); ?></a>
+                    <td data-label="<?= $this->getHtml('ID', '0', '0'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
+                    <td data-label="<?= $this->getHtml('Name'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getName()); ?></a>
+                    <td data-label="<?= $this->getHtml('Employees'); ?>">
+                    <td data-label="<?= $this->getHtml('Parent'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getParent()->getName()); ?></a>
                         <?php endforeach; ?>
                         <?php if ($c === 0) : ?>
                 <tr><td colspan="4" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
diff --git a/Theme/Backend/staff-create.tpl.php b/Theme/Backend/staff-create.tpl.php
index af49ce3..c5462ba 100755
--- a/Theme/Backend/staff-create.tpl.php
+++ b/Theme/Backend/staff-create.tpl.php
@@ -41,13 +41,13 @@ echo $this->getData('nav')->render();
                         <tr><td><input id="iName2" name="name2" type="text" placeholder="&#xf007; Fauntleroy">
                         <tr><td><label for="iName3"><?= $this->getHtml('Name3', 'Admin'); ?></label>
                         <tr><td><input id="iName3" name="name3" type="text" placeholder="&#xf007; Duck">
-                        <tr><td><label for="iAddress"><?= $this->getHtml('Address', 'Profile') ?></label>
+                        <tr><td><label for="iAddress"><?= $this->getHtml('Address', 'Profile'); ?></label>
                         <tr><td><input type="text" id="iAddress" name="address">
-                        <tr><td><label for="iZip"><?= $this->getHtml('Zip', 'Profile') ?></label>
+                        <tr><td><label for="iZip"><?= $this->getHtml('Zip', 'Profile'); ?></label>
                         <tr><td><input type="text" id="iZip" name="zip">
-                        <tr><td><label for="iCity"><?= $this->getHtml('City', 'Profile') ?></label>
+                        <tr><td><label for="iCity"><?= $this->getHtml('City', 'Profile'); ?></label>
                         <tr><td><input type="text" id="iCity" name="city">
-                        <tr><td><label for="iCountry"><?= $this->getHtml('Country', 'Profile') ?></label>
+                        <tr><td><label for="iCountry"><?= $this->getHtml('Country', 'Profile'); ?></label>
                         <tr><td><input type="text" id="iCountry" name="country">
                         <tr><td><label for="iBirthday"><?= $this->getHtml('Birthday', 'Profile'); ?></label>
                         <tr><td><input id="iBirthday" name="pirthday" type="text">
diff --git a/Theme/Backend/staff-list.tpl.php b/Theme/Backend/staff-list.tpl.php
index 13c5d18..d16f1f2 100755
--- a/Theme/Backend/staff-list.tpl.php
+++ b/Theme/Backend/staff-list.tpl.php
@@ -24,22 +24,22 @@ echo $this->getData('nav')->render(); ?>
 <div class="row">
     <div class="col-xs-12">
         <div class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Staff') ?><i class="fa fa-download floatRight download btn"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Staff'); ?><i class="fa fa-download floatRight download btn"></i></div>
             <table id="employeeList" class="default">
                 <thead>
                 <tr>
                     <td><?= $this->getHtml('ID', '0', '0'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                    <td class="wf-100"><?= $this->getHtml('Name') ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                    <td><?= $this->getHtml('Unit') ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                    <td><?= $this->getHtml('Position') ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                    <td><?= $this->getHtml('Department') ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                    <td><?= $this->getHtml('Status') ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
+                    <td class="wf-100"><?= $this->getHtml('Name'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
+                    <td><?= $this->getHtml('Unit'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
+                    <td><?= $this->getHtml('Position'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
+                    <td><?= $this->getHtml('Department'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
+                    <td><?= $this->getHtml('Status'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
                 <tbody>
                 <?php $c = 0; foreach ($employees as $key => $value) : ++$c;
                     $url = \phpOMS\Uri\UriFactory::build('{/prefix}humanresource/staff/profile?{?}&id=' . $value->getId()); ?>
                     <tr tabindex="0" data-href="<?= $url; ?>">
-                        <td data-label="<?= $this->getHtml('ID', '0', '0') ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
-                        <td data-label="<?= $this->getHtml('Name') ?>"><a href="<?= $url; ?>"><?= $this->printHtml(
+                        <td data-label="<?= $this->getHtml('ID', '0', '0'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
+                        <td data-label="<?= $this->getHtml('Name'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml(
                                 \sprintf('%3$s %2$s %1$s', $value->getProfile()->getAccount()->getName1(), $value->getProfile()->getAccount()->getName2(), $value->getProfile()->getAccount()->getName3())
                             ); ?></a>
                         <td><?= $this->printHtml($value->getNewestHistory()->getUnit()->getName()); ?>
diff --git a/Theme/Backend/staff-single.tpl.php b/Theme/Backend/staff-single.tpl.php
index 3a084bf..9c36d7f 100755
--- a/Theme/Backend/staff-single.tpl.php
+++ b/Theme/Backend/staff-single.tpl.php
@@ -36,7 +36,7 @@ echo $this->getData('nav')->render(); ?>
         </ul>
     </div>
     <div class="tab-content">
-        <input type="radio" id="c-tab-1" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-1' ? ' checked' : '' ?>>
+        <input type="radio" id="c-tab-1" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-1' ? ' checked' : ''; ?>>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12 col-md-6">
@@ -58,19 +58,19 @@ echo $this->getData('nav')->render(); ?>
                                 </span>
                                     <table class="list">
                                         <tr>
-                                            <th><?= $this->getHtml('Position') ?>
+                                            <th><?= $this->getHtml('Position'); ?>
                                             <td itemprop="jobTitle"><?= $this->printHtml($recentHistory->getPosition()->getName()); ?>
                                         <tr>
-                                            <th><?= $this->getHtml('Department') ?>
+                                            <th><?= $this->getHtml('Department'); ?>
                                             <td itemprop="jobTitle"><?= $this->printHtml($recentHistory->getDepartment()->getName()); ?>
                                         <tr>
-                                            <th><?= $this->getHtml('Unit') ?>
+                                            <th><?= $this->getHtml('Unit'); ?>
                                             <td itemprop="jobTitle"><?= $this->printHtml($recentHistory->getUnit()->getName()); ?>
                                         <tr>
-                                            <th><?= $this->getHtml('Birthday') ?>
+                                            <th><?= $this->getHtml('Birthday'); ?>
                                             <td itemprop="birthDate">06.09.1934
                                         <tr>
-                                            <th><?= $this->getHtml('Email') ?>
+                                            <th><?= $this->getHtml('Email'); ?>
                                             <td itemprop="email"><a href="mailto:<?= $this->printHtml($employee->getProfile()->getAccount()->getEmail()); ?>"><?= $this->printHtml($employee->getProfile()->getAccount()->getEmail()); ?></a>
                                         <tr>
                                             <th>Address
@@ -82,7 +82,7 @@ echo $this->getData('nav')->render(); ?>
                                             <th class="vT">Work
                                             <td itemprop="address">SMALLSYS INC<br>795 E DRAGRAM<br>TUCSON AZ 85705<br>USA
                                         <tr>
-                                            <th><?= $this->getHtml('Phone') ?>
+                                            <th><?= $this->getHtml('Phone'); ?>
                                             <td>
                                         <tr>
                                             <th>Private
@@ -94,7 +94,7 @@ echo $this->getData('nav')->render(); ?>
                                             <th>Work
                                             <td itemprop="telephone">+01 12345-4567
                                         <tr>
-                                            <th><?= $this->getHtml('Status') ?>
+                                            <th><?= $this->getHtml('Status'); ?>
                                             <td><span class="tag green"><?= !($recentHistory instanceof NullEmployeeHistory) ? $this->getHtml('Active') : $this->getHtml('Inactive'); ?></span>
                                     </table>
                                 <!-- @formatter:on -->
@@ -107,13 +107,13 @@ echo $this->getData('nav')->render(); ?>
                 <div class="col-xs-12">
                     <div class="box wf-100 x-overflow">
                         <table id="historyList" class="default">
-                            <caption><?= $this->getHtml('History') ?><i class="fa fa-download floatRight download btn"></i></caption>
+                            <caption><?= $this->getHtml('History'); ?><i class="fa fa-download floatRight download btn"></i></caption>
                             <thead>
-                                <td><?= $this->getHtml('Start') ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                                <td><?= $this->getHtml('End') ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                                <td><?= $this->getHtml('Unit') ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                                <td><?= $this->getHtml('Department') ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
-                                <td><?= $this->getHtml('Position') ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
+                                <td><?= $this->getHtml('Start'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
+                                <td><?= $this->getHtml('End'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
+                                <td><?= $this->getHtml('Unit'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
+                                <td><?= $this->getHtml('Department'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
+                                <td><?= $this->getHtml('Position'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
                             <tfoot>
                             <tbody>
                             <?php foreach ($history as $hist) : ?>
@@ -128,84 +128,84 @@ echo $this->getData('nav')->render(); ?>
                 </div>
             </div>
         </div>
-        <input type="radio" id="c-tab-2" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-2' ? ' checked' : '' ?>>
+        <input type="radio" id="c-tab-2" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-2' ? ' checked' : ''; ?>>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12">
                     <section class="box wf-100">
-                    <header><h1><?= $this->getHtml('Clocking') ?></h1></header>
+                    <header><h1><?= $this->getHtml('Clocking'); ?></h1></header>
                         <div class="inner">
                         </div>
                     </section>
                 </div>
             </div>
         </div>
-        <input type="radio" id="c-tab-3" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-3' ? ' checked' : '' ?>>
+        <input type="radio" id="c-tab-3" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-3' ? ' checked' : ''; ?>>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12">
                     <section class="box wf-100">
-                    <header><h1><?= $this->getHtml('Clocking') ?></h1></header>
+                    <header><h1><?= $this->getHtml('Clocking'); ?></h1></header>
                         <div class="inner">
                         </div>
                     </section>
                 </div>
             </div>
         </div>
-        <input type="radio" id="c-tab-4" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-4' ? ' checked' : '' ?>>
+        <input type="radio" id="c-tab-4" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-4' ? ' checked' : ''; ?>>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12">
                     <section class="box wf-100">
-                    <header><h1><?= $this->getHtml('Clocking') ?></h1></header>
+                    <header><h1><?= $this->getHtml('Clocking'); ?></h1></header>
                         <div class="inner">
                         </div>
                     </section>
                 </div>
             </div>
         </div>
-        <input type="radio" id="c-tab-5" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-5' ? ' checked' : '' ?>>
+        <input type="radio" id="c-tab-5" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-5' ? ' checked' : ''; ?>>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12">
                     <section class="box wf-100">
-                    <header><h1><?= $this->getHtml('Clocking') ?></h1></header>
+                    <header><h1><?= $this->getHtml('Clocking'); ?></h1></header>
                         <div class="inner">
                         </div>
                     </section>
                 </div>
             </div>
         </div>
-        <input type="radio" id="c-tab-6" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-6' ? ' checked' : '' ?>>
+        <input type="radio" id="c-tab-6" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-6' ? ' checked' : ''; ?>>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12">
                     <section class="box wf-100">
-                    <header><h1><?= $this->getHtml('Clocking') ?></h1></header>
+                    <header><h1><?= $this->getHtml('Clocking'); ?></h1></header>
                         <div class="inner">
                         </div>
                     </section>
                 </div>
             </div>
         </div>
-        <input type="radio" id="c-tab-7" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-7' ? ' checked' : '' ?>>
+        <input type="radio" id="c-tab-7" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-7' ? ' checked' : ''; ?>>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12">
                     <section class="box wf-100">
-                    <header><h1><?= $this->getHtml('Clocking') ?></h1></header>
+                    <header><h1><?= $this->getHtml('Clocking'); ?></h1></header>
                         <div class="inner">
                         </div>
                     </section>
                 </div>
             </div>
         </div>
-        <input type="radio" id="c-tab-8" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-8' ? ' checked' : '' ?>>
+        <input type="radio" id="c-tab-8" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-8' ? ' checked' : ''; ?>>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12">
                     <section class="box wf-100">
-                    <header><h1><?= $this->getHtml('Clocking') ?></h1></header>
+                    <header><h1><?= $this->getHtml('Clocking'); ?></h1></header>
                         <div class="inner">
                         </div>
                     </section>
diff --git a/tests/Admin/AdminTest.php b/tests/Admin/AdminTest.php
index 7c3ee77..b2cb906 100755
--- a/tests/Admin/AdminTest.php
+++ b/tests/Admin/AdminTest.php
@@ -20,6 +20,7 @@ namespace Modules\HumanResourceManagement\tests\Admin;
 class AdminTest extends \PHPUnit\Framework\TestCase
 {
     protected const MODULE_NAME = 'HumanResourceManagement';
+
     protected const URI_LOAD = '';
 
     use \Modules\tests\ModuleTestTrait;