diff --git a/Theme/Backend/clients-create.tpl.php b/Theme/Backend/clients-create.tpl.php
index b03b5f4..b4b087e 100644
--- a/Theme/Backend/clients-create.tpl.php
+++ b/Theme/Backend/clients-create.tpl.php
@@ -39,7 +39,7 @@ echo $this->getData('nav')->render(); ?>
                         <div class="inner">
                             <form>
                                 <table class="layout wf-100">
-                                    <tr><td><label for="iId"><?= $this->getHtml('ID', 0, 0); ?></label>
+                                    <tr><td><label for="iId"><?= $this->getHtml('ID', '0', '0'); ?></label>
                                     <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="number" id="iId" min="1" name="id" required></span>
                                     <tr><td><label for="iName1"><?= $this->getHtml('Name1') ?></label>
                                     <tr><td><input type="text" id="iName1" name="name1" placeholder="&#xf040;" required>
@@ -47,7 +47,7 @@ echo $this->getData('nav')->render(); ?>
                                     <tr><td><input type="text" id="iName2" name="name2" placeholder="&#xf040;">
                                     <tr><td><label for="iName3"><?= $this->getHtml('Name3') ?></label>
                                     <tr><td><input type="text" id="iName3" name="name3" placeholder="&#xf040;">
-                                    <tr><td colspan="2"><input type="submit" value="<?= $this->getHtml('Create', 0, 0); ?>">
+                                    <tr><td colspan="2"><input type="submit" value="<?= $this->getHtml('Create', '0', '0'); ?>">
                                 </table>
                             </form>
                         </div>
@@ -82,7 +82,7 @@ echo $this->getData('nav')->render(); ?>
                                     <tr><td><input type="text" id="iCInfo" name="cinfo">
                                     <tr><td><label for="iCData"><?= $this->getHtml('Contact') ?></label>
                                     <tr><td><input type="text" id="iCData" name="cdata">
-                                    <tr><td colspan="2"><input type="submit" value="<?= $this->getHtml('Add', 0, 0); ?>">
+                                    <tr><td colspan="2"><input type="submit" value="<?= $this->getHtml('Add', '0', '0'); ?>">
                                 </table>
                             </form>
                         </div>
@@ -114,7 +114,7 @@ echo $this->getData('nav')->render(); ?>
                                     <tr><td><label for="iAInfo"><?= $this->getHtml('Info') ?></label>
                                     <tr><td><input type="text" id="iAInfo" name="ainfo">
                                     <tr><td><span class="check"><input type="checkbox" id="iDefault" name="default" checked><label for="iDefault"><?= $this->getHtml('IsDefault') ?></label></span>
-                                    <tr><td colspan="2"><input type="submit" value="<?= $this->getHtml('Add', 0, 0); ?>">
+                                    <tr><td colspan="2"><input type="submit" value="<?= $this->getHtml('Add', '0', '0'); ?>">
                                 </table>
                             </form>
                         </div>
@@ -146,7 +146,7 @@ echo $this->getData('nav')->render(); ?>
                                                 <option>
                                             </select>
                                     <tr><td><span class="check"><input type="checkbox" id="iFreightage" name="freightage"><label for="iFreightage"><?= $this->getHtml('Freightage'); ?></label></span>
-                                    <tr><td colspan="2"><input type="submit" value="<?= $this->getHtml('Add', 0, 0); ?>">
+                                    <tr><td colspan="2"><input type="submit" value="<?= $this->getHtml('Add', '0', '0'); ?>">
                                 </table>
                             </form>
                         </div>
@@ -168,7 +168,7 @@ echo $this->getData('nav')->render(); ?>
                                                 <option><?= $this->getHtml('Wire') ?>
                                                 <option><?= $this->getHtml('Creditcard') ?>
                                             </select>
-                                    <tr><td colspan="2"><input type="submit" value="<?= $this->getHtml('Add', 0, 0); ?>">
+                                    <tr><td colspan="2"><input type="submit" value="<?= $this->getHtml('Add', '0', '0'); ?>">
                                 </table>
                             </form>
                         </div>
@@ -210,7 +210,7 @@ echo $this->getData('nav')->render(); ?>
                                     <tr><td><input id="iDiscountP" name="discountp" type="number" step="any" min="0" placeholder=""><td>
                                     <tr><td><label for="iBonus"><?= $this->getHtml('Bonus'); ?></label>
                                     <tr><td><input id="iBonus" name="bonus" type="number" step="any" min="0" placeholder=""><td>
-                                    <tr><td><input type="submit" value="<?= $this->getHtml('Add', 0, 0); ?>">
+                                    <tr><td><input type="submit" value="<?= $this->getHtml('Add', '0', '0'); ?>">
                                 </table>
                             </form>
                         </div>
@@ -240,7 +240,7 @@ echo $this->getData('nav')->render(); ?>
                                     <tr><td><input id="iGroup" name="group" type="text" placeholder="">
                                     <tr><td><label for="iArticlegroup"><?= $this->getHtml('Articlegroup'); ?></label>
                                     <tr><td><input id="iArticlegroup" name="articlegroup" type="text" placeholder="">
-                                    <tr><td><input type="submit" value="<?= $this->getHtml('Add', 0, 0); ?>">
+                                    <tr><td><input type="submit" value="<?= $this->getHtml('Add', '0', '0'); ?>">
                                 </table>
                             </form>
                         </div>
@@ -267,7 +267,7 @@ echo $this->getData('nav')->render(); ?>
                             <thead>
                             <tr>
                                 <td>IP
-                                <td><?= $this->getHtml('ID', 0, 0); ?>
+                                <td><?= $this->getHtml('ID', '0', '0'); ?>
                                 <td><?= $this->getHtml('Name') ?>
                                 <td class="wf-100"><?= $this->getHtml('Log') ?>
                                 <td><?= $this->getHtml('Date') ?>
diff --git a/Theme/Backend/clients-list.tpl.php b/Theme/Backend/clients-list.tpl.php
index c901a24..a2f4866 100644
--- a/Theme/Backend/clients-list.tpl.php
+++ b/Theme/Backend/clients-list.tpl.php
@@ -65,7 +65,7 @@ echo $this->getData('nav')->render(); ?>
                 <caption><?= $this->getHtml('Clients'); ?><i class="fa fa-download floatRight download btn"></i></caption>
                 <thead>
                 <tr>
-                    <td><?= $this->getHtml('ID', 0, 0); ?>
+                    <td><?= $this->getHtml('ID', '0', '0'); ?>
                     <td><?= $this->getHtml('Name1') ?>
                     <td><?= $this->getHtml('Name2') ?>
                     <td class="wf-100"><?= $this->getHtml('Name3') ?>
@@ -80,7 +80,7 @@ echo $this->getData('nav')->render(); ?>
                 <?php $count = 0; foreach ($clients as $key => $value) : ++$count;
                  $url = \phpOMS\Uri\UriFactory::build('{/prefix}sales/client/profile?{?}&id=' . $value->getId()); ?>
                 <tr data-href="<?= $url; ?>">
-                    <td data-label="<?= $this->getHtml('ID', 0, 0) ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getNumber()); ?></a>
+                    <td data-label="<?= $this->getHtml('ID', '0', '0') ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getNumber()); ?></a>
                     <td data-label="<?= $this->getHtml('Name1') ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getProfile()->getAccount()->getName1()); ?></a>
                     <td data-label="<?= $this->getHtml('Name2') ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getProfile()->getAccount()->getName2()); ?></a>
                     <td data-label="<?= $this->getHtml('Name3') ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getProfile()->getAccount()->getName3()); ?></a>
@@ -90,7 +90,7 @@ echo $this->getData('nav')->render(); ?>
                     <td data-label="<?= $this->getHtml('Country') ?>">
                 <?php endforeach; ?>
                 <?php if ($count === 0) : ?>
-                <tr><td colspan="8" class="empty"><?= $this->getHtml('Empty', 0, 0); ?>
+                <tr><td colspan="8" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
                         <?php endif; ?>
             </table>
         </div>
diff --git a/Theme/Backend/clients-profile.tpl.php b/Theme/Backend/clients-profile.tpl.php
index 038b06c..8b563df 100644
--- a/Theme/Backend/clients-profile.tpl.php
+++ b/Theme/Backend/clients-profile.tpl.php
@@ -48,7 +48,7 @@ echo $this->getData('nav')->render();
                         <div class="inner">
                             <form>
                                 <table class="layout wf-100">
-                                    <tr><td><label for="iId"><?= $this->getHtml('ID', 0, 0); ?></label>
+                                    <tr><td><label for="iId"><?= $this->getHtml('ID', '0', '0'); ?></label>
                                     <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="number" id="iId" min="1" name="id" value="<?= $this->printHtml($client->getNumber()); ?>" disabled></span>
                                     <tr><td><label for="iName1"><?= $this->getHtml('Name1') ?></label>
                                     <tr><td><input type="text" id="iName1" name="name1" placeholder="&#xf040;" value="<?= $this->printHtml($client->getProfile()->getAccount()->getName1()); ?>" required>
@@ -56,7 +56,7 @@ echo $this->getData('nav')->render();
                                     <tr><td><input type="text" id="iName2" name="name2" value="<?= $this->printHtml($client->getProfile()->getAccount()->getName2()); ?>" placeholder="&#xf040;">
                                     <tr><td><label for="iName3"><?= $this->getHtml('Name3') ?></label>
                                     <tr><td><input type="text" id="iName3" name="name3" value="<?= $this->printHtml($client->getProfile()->getAccount()->getName3()); ?>" placeholder="&#xf040;">
-                                    <tr><td ><input type="submit" value="<?= $this->getHtml('Save', 0, 0); ?>"> <input type="submit" value="<?= $this->getHtml('Delete', 0, 0); ?>">
+                                    <tr><td ><input type="submit" value="<?= $this->getHtml('Save', '0', '0'); ?>"> <input type="submit" value="<?= $this->getHtml('Delete', '0', '0'); ?>">
                                 </table>
                             </form>
                         </div>
@@ -91,7 +91,7 @@ echo $this->getData('nav')->render();
                                     <tr><td><input type="text" id="iCInfo" name="cinfo">
                                     <tr><td><label for="iCData"><?= $this->getHtml('Contact') ?></label>
                                     <tr><td><input type="text" id="iCData" name="cdata">
-                                    <tr><td colspan="2"><input type="submit" value="<?= $this->getHtml('Add', 0, 0); ?>">
+                                    <tr><td colspan="2"><input type="submit" value="<?= $this->getHtml('Add', '0', '0'); ?>">
                                 </table>
                             </form>
                         </div>
@@ -123,7 +123,7 @@ echo $this->getData('nav')->render();
                                     <tr><td><label for="iAInfo"><?= $this->getHtml('Info') ?></label>
                                     <tr><td><input type="text" id="iAInfo" name="ainfo">
                                     <tr><td><span class="check"><input type="checkbox" id="iDefault" name="default" checked><label for="iDefault"><?= $this->getHtml('IsDefault') ?></label></span>
-                                    <tr><td colspan="2"><input type="submit" value="<?= $this->getHtml('Add', 0, 0); ?>">
+                                    <tr><td colspan="2"><input type="submit" value="<?= $this->getHtml('Add', '0', '0'); ?>">
                                 </table>
                             </form>
                         </div>
@@ -155,7 +155,7 @@ echo $this->getData('nav')->render();
                                                 <option>
                                             </select>
                                     <tr><td><span class="check"><input type="checkbox" id="iFreightage" name="freightage"><label for="iFreightage"><?= $this->getHtml('Freightage'); ?></label></span>
-                                    <tr><td colspan="2"><input type="submit" value="<?= $this->getHtml('Add', 0, 0); ?>">
+                                    <tr><td colspan="2"><input type="submit" value="<?= $this->getHtml('Add', '0', '0'); ?>">
                                 </table>
                             </form>
                         </div>
@@ -177,7 +177,7 @@ echo $this->getData('nav')->render();
                                                 <option><?= $this->getHtml('Wire') ?>
                                                 <option><?= $this->getHtml('Creditcard') ?>
                                             </select>
-                                    <tr><td colspan="2"><input type="submit" value="<?= $this->getHtml('Add', 0, 0); ?>">
+                                    <tr><td colspan="2"><input type="submit" value="<?= $this->getHtml('Add', '0', '0'); ?>">
                                 </table>
                             </form>
                         </div>
@@ -219,7 +219,7 @@ echo $this->getData('nav')->render();
                                     <tr><td><input id="iDiscountP" name="discountp" type="number" step="any" min="0" placeholder=""><td>
                                     <tr><td><label for="iBonus"><?= $this->getHtml('Bonus'); ?></label>
                                     <tr><td><input id="iBonus" name="bonus" type="number" step="any" min="0" placeholder=""><td>
-                                    <tr><td><input type="submit" value="<?= $this->getHtml('Add', 0, 0); ?>">
+                                    <tr><td><input type="submit" value="<?= $this->getHtml('Add', '0', '0'); ?>">
                                 </table>
                             </form>
                         </div>
@@ -249,7 +249,7 @@ echo $this->getData('nav')->render();
                                     <tr><td><input id="iGroup" name="group" type="text" placeholder="">
                                     <tr><td><label for="iArticlegroup"><?= $this->getHtml('Articlegroup'); ?></label>
                                     <tr><td><input id="iArticlegroup" name="articlegroup" type="text" placeholder="">
-                                    <tr><td><input type="submit" value="<?= $this->getHtml('Add', 0, 0); ?>">
+                                    <tr><td><input type="submit" value="<?= $this->getHtml('Add', '0', '0'); ?>">
                                 </table>
                             </form>
                         </div>
@@ -276,7 +276,7 @@ echo $this->getData('nav')->render();
                             <thead>
                             <tr>
                                 <td>IP
-                                <td><?= $this->getHtml('ID', 0, 0); ?>
+                                <td><?= $this->getHtml('ID', '0', '0'); ?>
                                 <td><?= $this->getHtml('Name') ?>
                                 <td class="wf-100"><?= $this->getHtml('Log') ?>
                                 <td><?= $this->getHtml('Date') ?>