diff --git a/Theme/Backend/news-create.tpl.php b/Theme/Backend/news-create.tpl.php
index 89be731..89aa292 100644
--- a/Theme/Backend/news-create.tpl.php
+++ b/Theme/Backend/news-create.tpl.php
@@ -41,13 +41,22 @@ echo $this->getData('nav')->render(); ?>
             <div class="inner">
                 <form id="docForm" method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/news?{?}&csrf={$CSRF}'); ?>">
                     <table class="layout wf-100">
-                        <tr><td colspan="2"><label for="publish"><?= $this->getHtml('Status'); ?></label>
-                        <tr><td colspan="2"><select name="status">
+                        <tr><td colspan="2"><label for="iStatus"><?= $this->getHtml('Status'); ?></label>
+                        <tr><td colspan="2"><select name="status" id="iStatus">
                                     <option value="<?= $this->printHtml(Modules\News\Models\NewsStatus::DRAFT); ?>" selected><?= $this->getHtml('Draft'); ?>
                                     <option value="<?= $this->printHtml(Modules\News\Models\NewsStatus::VISIBLE); ?>"><?= $this->getHtml('Visible'); ?>
-                        <tr><td colspan="2"><label for="publish"><?= $this->getHtml('Publish'); ?></label>
-                        <tr><td colspan="2"><input type="datetime-local" id="publish" value="<?= $this->printHtml((new \DateTime('NOW'))->format('Y-m-d\TH:i:s')); ?>">
-                        <tr><td><input type="submit" value="<?= $this->getHtml('Delete', 0); ?>"><td class="rightText"><input type="submit" value="<?= $this->getHtml('Save', 0); ?>"> <input type="submit" value="<?= $this->getHtml('Publish'); ?>">
+                        <tr>
+                            <td colspan="2">
+                                <label for="iPublish"><?= $this->getHtml('Publish'); ?></label>
+                        <tr>
+                            <td colspan="2">
+                                <input type="datetime-local" name="publish" id="iPublish" value="<?= $this->printHtml((new \DateTime('NOW'))->format('Y-m-d\TH:i:s')); ?>">
+                        <tr>
+                            <td>
+                                <input type="submit" name="deleteButton" id="iDeleteButton" value="<?= $this->getHtml('Delete', 0); ?>">
+                            <td class="rightText">
+                                <input type="submit" name="saveButton" id="iSaveButton" value="<?= $this->getHtml('Save', 0); ?>"> 
+                                <input type="submit" name="publishButton" id="iPublishButton" value="<?= $this->getHtml('Publish'); ?>">
                     </table>
                 </form>
             </div>
@@ -55,10 +64,22 @@ echo $this->getData('nav')->render(); ?>
         <section class="box wf-100">
             <div class="inner">
                 <table class="layout wf-100">
-                    <tr><td colspan="2"><label><?= $this->getHtml('Type'); ?></label>
-                    <tr><td colspan="2"><span class="radio"><input type="radio" name="type" form="docForm" value="<?= $this->printHtml(Modules\News\Models\NewsType::ARTICLE); ?>" id="news" checked><label for="news"><?= $this->getHtml('News'); ?></label></span>
-                    <tr><td colspan="2"><span class="radio"><input type="radio" name="type" form="docForm" value="<?= $this->printHtml(Modules\News\Models\NewsType::HEADLINE); ?>" id="headline"><label for="headline"><?= $this->getHtml('Headline'); ?></label></span>
-                    <tr><td colspan="2"><span class="radio"><input type="radio" name="type" form="docForm" value="<?= $this->printHtml(Modules\News\Models\NewsType::LINK); ?>" id="link"><label for="link"><?= $this->getHtml('Link'); ?></label></span>
+                    <tr><td colspan="2"><label for="iNewsType"><?= $this->getHtml('Type'); ?></label>
+                    <tr><td colspan="2">
+                        <span class="radio">
+                            <input type="radio" name="type" id="iNewsType" form="docForm" value="<?= $this->printHtml(Modules\News\Models\NewsType::ARTICLE); ?>" id="news" checked>
+                            <label for="news"><?= $this->getHtml('News'); ?></label>
+                        </span>
+                    <tr><td colspan="2">
+                        <span class="radio">
+                            <input type="radio" name="type" form="docForm" value="<?= $this->printHtml(Modules\News\Models\NewsType::HEADLINE); ?>" id="headline">
+                            <label for="headline"><?= $this->getHtml('Headline'); ?></label>
+                        </span>
+                    <tr><td colspan="2">
+                        <span class="radio">
+                            <input type="radio" name="type" form="docForm" value="<?= $this->printHtml(Modules\News\Models\NewsType::LINK); ?>" id="link">
+                            <label for="link"><?= $this->getHtml('Link'); ?></label>
+                        </span>
                 </table>
             </div>
         </section>
@@ -66,7 +87,11 @@ echo $this->getData('nav')->render(); ?>
             <div class="inner">
                 <table class="layout wf-100">
                     <tr><td><label for="permission"><?= $this->getHtml('Permissions'); ?></label>
-                    <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="text" id="permission"><input type="hidden" form="docForm" name="permission"></span>
+                    <tr><td>
+                        <span class="input">
+                            <button type="button" formaction=""><i class="fa fa-book"></i></button>
+                            <input type="text" id="permission"><input type="hidden" form="docForm" name="permission">
+                        </span>
                     <tr><td><button><?= $this->getHtml('Add', 0, 0); ?></button>
                 </table>
             </div>
@@ -75,7 +100,11 @@ echo $this->getData('nav')->render(); ?>
             <div class="inner">
                 <table class="layout wf-100">
                     <tr><td colspan="2"><label for="groups"><?= $this->getHtml('Groups'); ?></label>
-                    <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input  type="text" id="groups"><input type="hidden" form="docForm" name="groups"></span>
+                    <tr><td>
+                        <span class="input">
+                            <button type="button" formaction=""><i class="fa fa-book"></i></button>
+                            <input  type="text" id="groups"><input type="hidden" form="docForm" name="groups">
+                        </span>
                     <tr><td><button><?= $this->getHtml('Add', 0, 0); ?></button>
                 </table>
             </div>