diff --git a/bitbake/lib/toaster/bldviewer/templates/task.html b/bitbake/lib/toaster/bldviewer/templates/task.html
index 6a9979e533..de965ab797 100644
--- a/bitbake/lib/toaster/bldviewer/templates/task.html
+++ b/bitbake/lib/toaster/bldviewer/templates/task.html
@@ -14,12 +14,11 @@
             <th>Checksum</th>
             <th>Outcome</th>
             <th>Message</th>
-            <th>Logfile</th>
             <th>Time</th>
             <th>CPU usage</th>
             <th>Disk I/O</th>
             <th>Script type</th>
-            <th>File path</th>
+            <th>Filesystem</th>
             <th>Depends</th>
             </tr>
 
@@ -40,12 +39,17 @@
                 <td>{{task.sstate_checksum}}</td>
                 <td>{{task.get_outcome_display}}{% if task.provider %}</br>(by <a href="#{{task.provider.recipe.name}}.{{task.provider.task_name}}">{{task.provider.recipe.name}}.{{task.provider.task_name}}</a>){% endif %}</td>
                 <td><p>{{task.message}}</td>
-                <td><a target="_fileview" href="file:///{{task.logfile}}">{{task.logfile}}</a></td>
                 <td>{{task.elapsed_time}}</td>
                 <td>{{task.cpu_usage}}</td>
                 <td>{{task.disk_io}}</td>
                 <td>{{task.get_script_type_display}}</td>
-                <td><a target="_fileview" href="file:///{{task.recipe.file_path}}">{{task.recipe.file_path}}</a></td>
+                <td> <table>
+<tr><td>                Recipe</td><td><a target="_fileview" href="file:///{{task.recipe.file_path}}">{{task.recipe.file_path}}</a></td></tr>
+<tr><td>                Source</td><td><a target="_fileview" href="file:///{{task.file_name}}">{{task.file_name}}:{{task.line_number}}</a></td></tr>
+<tr><td>                Workdir</td><td><a target="_fileview" href="file:///{{task.work_directory}}">{{task.work_directory}}</a></td></tr>
+<tr><td>                Log</td><td><a target="_fileview" href="file:///{{task.logfile}}">{{task.logfile}}</a><br/></td></tr>
+</table>
+                </td>
                 <td>
             <div style="height: 3em; overflow:auto">
                 {% for tt in task.task_dependencies_task.all %}