diff --git a/Theme/Backend/checklist-list.tpl.php b/Theme/Backend/checklist-list.tpl.php
index bc84428..6f766c4 100755
--- a/Theme/Backend/checklist-list.tpl.php
+++ b/Theme/Backend/checklist-list.tpl.php
@@ -19,7 +19,7 @@ echo $this->data['nav']->render(); ?>
 
 <div class="row">
     <div class="col-xs-12">
-        <div class="portlet">
+        <section class="portlet">
             <div class="portlet-head"><?= $this->getHtml('Checklists'); ?><i class="g-icon download btn end-xs">download</i></div>
             <div class="slider">
             <table class="default sticky">
@@ -42,6 +42,6 @@ echo $this->data['nav']->render(); ?>
                 <?php endif; ?>
             </table>
             </div>
-        </div>
+        </section>
     </div>
 </div>
diff --git a/Theme/Backend/checklist-task.tpl.php b/Theme/Backend/checklist-task.tpl.php
index 9a75297..96b5c74 100644
--- a/Theme/Backend/checklist-task.tpl.php
+++ b/Theme/Backend/checklist-task.tpl.php
@@ -20,7 +20,7 @@ echo $this->data['nav']->render(); ?>
 
 <div class="row">
     <div class="col-xs-12 col-md-6">
-        <div class="portlet">
+        <section class="portlet">
             <form id="fTask" method="PUT" action="<?= \phpOMS\Uri\UriFactory::build('{/api}task?{?}&csrf={$CSRF}'); ?>">
                 <div class="portlet-head"><?= $this->getHtml('Task'); ?></div>
                 <div class="portlet-body">
@@ -69,11 +69,11 @@ echo $this->data['nav']->render(); ?>
                     <input type="hidden" name="type" value="<?= TaskType::SINGLE; ?>">
                 </div>
             </form>
-        </div>
+        </section>
     </div>
 
     <div class="col-xs-12 col-md-6">
-        <div class="portlet">
+        <section class="portlet">
             <div class="portlet-head"><?= $this->getHtml('Media'); ?></div>
             <div class="portlet-body">
                 <form>
@@ -91,7 +91,7 @@ echo $this->data['nav']->render(); ?>
                     </div>
                 </div>
             </form>
-        </div>
+        </section>
     </div>
 </div>
 
diff --git a/Theme/Backend/checklist-template-list.tpl.php b/Theme/Backend/checklist-template-list.tpl.php
index 9613aa8..2efd2b2 100755
--- a/Theme/Backend/checklist-template-list.tpl.php
+++ b/Theme/Backend/checklist-template-list.tpl.php
@@ -19,7 +19,7 @@ echo $this->data['nav']->render(); ?>
 
 <div class="row">
     <div class="col-xs-12">
-        <div class="portlet">
+        <section class="portlet">
             <div class="portlet-head">
                 <?= $this->getHtml('Templates'); ?>
                 <i class="g-icon download btn end-xs">download</i></div>
@@ -44,6 +44,6 @@ echo $this->data['nav']->render(); ?>
                 <?php endif; ?>
             </table>
             </div>
-        </div>
+        </section>
     </div>
 </div>
diff --git a/Theme/Backend/checklist-template.tpl.php b/Theme/Backend/checklist-template.tpl.php
index b27ecc3..044f2d2 100644
--- a/Theme/Backend/checklist-template.tpl.php
+++ b/Theme/Backend/checklist-template.tpl.php
@@ -29,7 +29,7 @@ echo $this->data['nav']->render(); ?>
 
 <div class="row">
     <div class="col-xs-12 col-md-6">
-        <div class="portlet">
+        <section class="portlet">
             <form id="fTemplate" method="<?= $isNew ? 'PUT' : 'POST'; ?>" action="<?= UriFactory::build('{/api}checklist/template?{?}&csrf={$CSRF}'); ?>">
             <div class="portlet-head"><?= $this->getHtml('Template'); ?></div>
             <div class="portlet-body">
@@ -61,7 +61,7 @@ echo $this->data['nav']->render(); ?>
 
                 <div class="form-group">
                     <label for="iDescription"><?= $this->getHtml('Description'); ?></label>
-                    <textarea id="iDescription" name="desc"><?= $this->printHtml($template->description); ?></textarea>
+                    <textarea id="iDescription" name="desc"><?= $this->printTextarea($template->description); ?></textarea>
                 </div>
 
                 <?php if ($isNew) : ?>
@@ -81,14 +81,14 @@ echo $this->data['nav']->render(); ?>
                 <?php endif; ?>
             </div>
             </form>
-        </div>
+        </section>
     </div>
 </div>
 
 <?php if (!$isNew) : ?>
 <div class="row">
     <div class="col-xs-12">
-        <div class="portlet">
+        <section class="portlet">
             <div class="portlet-head">
                 <?= $this->getHtml('Tasks'); ?>
                 <span class="end-xs">
@@ -128,7 +128,7 @@ echo $this->data['nav']->render(); ?>
                 <?php endif; ?>
             </table>
             </div>
-        </div>
+        </section>
     </div>
 </div>
 <?php endif; ?>
diff --git a/Theme/Backend/checklist-view.tpl.php b/Theme/Backend/checklist-view.tpl.php
index 84cc462..1efc570 100644
--- a/Theme/Backend/checklist-view.tpl.php
+++ b/Theme/Backend/checklist-view.tpl.php
@@ -22,7 +22,7 @@ echo $this->data['nav']->render(); ?>
 
 <div class="row">
     <div class="col-xs-12">
-        <div class="portlet">
+        <section class="portlet">
             <div class="portlet-head"><?= $this->getHtml('Tasks'); ?><i class="g-icon download btn end-xs">download</i></div>
             <div class="slider">
             <table class="default sticky">
@@ -60,10 +60,10 @@ echo $this->data['nav']->render(); ?>
                 <?php endforeach; ?>
                 <?php if ($c === 0) : ?>
                 <tr>
-                    <td colspan="2" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
+                    <td colspan="4" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
                 <?php endif; ?>
             </table>
             </div>
-        </div>
+        </section>
     </div>
 </div>