diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 860e93704..99f6414c7 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -21,6 +21,7 @@ Contributors:
 - [David-Norris](https://github.com/David-Norris)
 - [Draza (bdpsoft)](https://github.com/bdpsoft)
 - [Esteban Monge](https://github.com/EstebanMonge)
+- [Fábio Hideki](https://github.com/fabiohxcx)
 - [Federico Lazcano](https://github.com/lazki)
 - [Fengchao](https://github.com/fengchao)
 - [Floaltvater](https://github.com/floaltvater)
diff --git a/app/Template/board/task_footer.php b/app/Template/board/task_footer.php
index e191dca75..551619215 100644
--- a/app/Template/board/task_footer.php
+++ b/app/Template/board/task_footer.php
@@ -60,6 +60,6 @@
     <?php endif ?>
 
     <?php if (! empty($task['time_estimated'])): ?>
-        <strong><?= $this->e($task['time_estimated']).'h' ?> <?= t('estimated') ?></strong>
+        <span class="task-time-estimated" title="<?= t('Time estimated') ?>"><?= $this->e($task['time_estimated']).'h' ?></span>
     <?php endif ?>
 </div>
diff --git a/app/Template/task/details.php b/app/Template/task/details.php
index 7a99371f3..e8fdf5cd6 100644
--- a/app/Template/task/details.php
+++ b/app/Template/task/details.php
@@ -9,9 +9,9 @@
             <strong><?= t('Reference: %s', $task['reference']) ?></strong>
         </li>
         <?php endif ?>
-        <?php if ($task['swimlane_id']): ?>
+        <?php if (! empty($task['swimlane_name'])): ?>
         <li>
-            <?= t('Swimlane: %s ', $this->swimlane->getNameById($task['swimlane_id'])) ?>
+            <?= t('Swimlane: %s', $task['swimlane_name']) ?>
         </li>
         <?php endif ?>
         <li>