diff --git a/module/testtask/view/close.html.php b/module/testtask/view/close.html.php
index c1563d4878..5948a0818b 100644
--- a/module/testtask/view/close.html.php
+++ b/module/testtask/view/close.html.php
@@ -17,11 +17,11 @@
   <table class='table table-form'>
     <caption><?php echo $testtask->name;?></caption>
     <tr>
-      <td><?php echo $lang->testtask->report;?></td>
+      <th class='rowhead'><?php echo $lang->testtask->report;?></td>
       <td><?php echo html::textarea('report', '', "rows='6' class='form-control'");?></td>
     </tr>
     <tr>
-      <td><?php echo $lang->comment;?></td>
+      <th class='rowhead'><?php echo $lang->comment;?></td>
       <td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
     </tr>
     <tr>
diff --git a/module/testtask/view/edit.html.php b/module/testtask/view/edit.html.php
index 570d3a70fd..b44773ce48 100644
--- a/module/testtask/view/edit.html.php
+++ b/module/testtask/view/edit.html.php
@@ -50,11 +50,11 @@
     </tr>  
     <tr>
       <th><?php echo $lang->testtask->desc;?></th>
-      <td><?php echo html::textarea('desc', $task->desc, "rows=10 class='form-control'");?></td>
+      <td><?php echo html::textarea('desc', htmlspecialchars($task->desc), "rows=10 class='form-control'");?></td>
     </tr>  
     <tr>
       <th><?php echo $lang->testtask->report;?></th>
-      <td><?php echo html::textarea('report', $task->report, "rows=10 class='form-control'");?></td>
+      <td><?php echo html::textarea('report', htmlspecialchars($task->report), "rows=10 class='form-control'");?></td>
     </tr>  
     <tr>
       <td colspan='2' class='text-center'><?php echo html::submitButton() . html::backButton();?> </td>
diff --git a/module/testtask/view/start.html.php b/module/testtask/view/start.html.php
index 78b2770c48..99f83d5d49 100644
--- a/module/testtask/view/start.html.php
+++ b/module/testtask/view/start.html.php
@@ -17,7 +17,7 @@
   <table class='table table-form'>
     <caption><?php echo $testtask->name;?></caption>
     <tr>
-      <td><?php echo $lang->comment;?></td>
+      <th class='rowhead'><?php echo $lang->comment;?></td>
       <td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
     </tr>
     <tr>