diff --git a/module/product/view/close.html.php b/module/product/view/close.html.php
index 2b523244f6..c5b5cc4c6c 100644
--- a/module/product/view/close.html.php
+++ b/module/product/view/close.html.php
@@ -25,7 +25,7 @@
   <form class='load-indicator main-form' method='post' target='hiddenwin'>
     <table class='table table-form'>
       <tr>
-        <th><?php echo $lang->comment;?></th>
+        <th class='w-40px'><?php echo $lang->comment;?></th>
         <td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
       </tr>
       <tr>
diff --git a/module/product/view/view.html.php b/module/product/view/view.html.php
index 309578113b..12b31d9e85 100644
--- a/module/product/view/view.html.php
+++ b/module/product/view/view.html.php
@@ -216,7 +216,7 @@
         echo "<div class='divider'></div>";
         if($product->status != 'closed')
         {
-            common::printIcon('product', 'close', "productID=$product->id", $product, 'button', '', '', 'iframe text-danger', true);
+            common::printIcon('product', 'close', "productID=$product->id", $product, 'button', '', '', 'iframe', true);
             echo "<div class='divider'></div>";
         }
 
diff --git a/module/project/view/close.html.php b/module/project/view/close.html.php
index d6d3675f8c..9c874646bf 100644
--- a/module/project/view/close.html.php
+++ b/module/project/view/close.html.php
@@ -26,7 +26,7 @@
     <table class='table table-form'>
       <tbody>
         <tr>
-          <th><?php echo $lang->comment;?></th>
+          <th class='w-50px'><?php echo $lang->comment;?></th>
           <td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
         </tr>
         <tr>
diff --git a/module/project/view/putoff.html.php b/module/project/view/putoff.html.php
index d52c152258..ac1761efb6 100644
--- a/module/project/view/putoff.html.php
+++ b/module/project/view/putoff.html.php
@@ -27,7 +27,7 @@
     <table class='table table-form'>
       <tbody>
         <tr>
-          <th><?php echo $lang->project->dateRange;?></th>
+          <th class='w-80px'><?php echo $lang->project->dateRange;?></th>
           <td colspan='2'>
             <div class='input-group'>
               <?php echo html::input('begin', $project->begin, "class='form-control form-date' onchange='computeWorkDays()' placeholder='" . $lang->project->begin . "'");?>
@@ -43,7 +43,7 @@
               </div>
             </div>
           </td>
-          <td></td>
+          <td class='w-100px'></td>
         </tr>
         <tr>
           <th><?php echo $lang->project->days;?></th>
diff --git a/module/project/view/start.html.php b/module/project/view/start.html.php
index 87a28fbcbe..2e6c6ef130 100644
--- a/module/project/view/start.html.php
+++ b/module/project/view/start.html.php
@@ -26,7 +26,7 @@
     <table class='table table-form'>
       <tbody>
         <tr>
-          <th><?php echo $lang->comment;?></th>
+          <th class='w-40px'><?php echo $lang->comment;?></th>
           <td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
         </tr>
         <tr>
diff --git a/module/project/view/suspend.html.php b/module/project/view/suspend.html.php
index 3c4149ddf2..2bc7af067a 100644
--- a/module/project/view/suspend.html.php
+++ b/module/project/view/suspend.html.php
@@ -25,7 +25,7 @@
   <form class='load-indicator main-form' method='post' target='hiddenwin'>
     <table class='table table-form'>
       <tr>
-        <th><?php echo $lang->comment;?></th>
+        <th class='w-50px'><?php echo $lang->comment;?></th>
         <td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
       </tr>
       <tr>
diff --git a/module/task/model.php b/module/task/model.php
index 2b09fe0da1..e349c666d8 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -2326,7 +2326,7 @@ class taskModel extends model
                     else if ($assignedToText == $account) $btnTextClass = 'text-red';
                     $btnClass = $assignedToText == 'closed' ? ' disabled' : '';
                     
-                    echo html::a(helper::createLink('task', 'assignTo', "projectID=$task->project&taskID=$task->id"), "<i class='icon icon-hand-right'></i> <span class='{$btnTextClass}'>{$assignedToText}</span>", '', "class='iframe btn btn-icon-left{$btnClass}'");
+                    echo html::a(helper::createLink('task', 'assignTo', "projectID=$task->project&taskID=$task->id", '', true), "<i class='icon icon-hand-right'></i> <span class='{$btnTextClass}'>{$assignedToText}</span>", '', "class='iframe btn btn-icon-left{$btnClass}'");
                     break;
                 case 'assignedDate':
                     echo substr($task->assignedDate, 5, 11);