diff --git a/vrobbler/templates/scrobbles/scrobble_all_list.html b/vrobbler/templates/scrobbles/scrobble_all_list.html
index 2f4f6c4..4851d91 100644
--- a/vrobbler/templates/scrobbles/scrobble_all_list.html
+++ b/vrobbler/templates/scrobbles/scrobble_all_list.html
@@ -25,8 +25,11 @@
             </thead>
             <tbody>
                 {% for scrobble in object_list %}
-                <tr>
-                    <td><a href="{{scrobble.get_absolute_url}}">{{ scrobble.timestamp|naturaltime }}</a></td>
+                <tr class="{% if scrobble.id in overlap_map %}{{ overlap_map.scrobble.id }}{% endif %}">
+                    <td>
+                        {% if scrobble.id in overlap_map %}⏱ {% endif %}
+                        <a href="{{scrobble.get_absolute_url}}">{{ scrobble.timestamp|naturaltime }}</a>
+                    </td>
                     <td>
                         {% if scrobble.video %}
                         🎬 Video
@@ -96,7 +99,7 @@
                         {% elif scrobble.brick_set %}
                         <a href="{% url 'bricksets:brickset_detail' scrobble.brick_set.uuid %}">{{ scrobble.brick_set.title }}</a>
                         {% elif scrobble.task %}
-                        <a href="{% url 'tasks:task_detail' scrobble.task.uuid %}">Task - {{ scrobble.log.title }}</a>
+                        <a href="{% url 'tasks:task_detail' scrobble.task.uuid %}">{{scrobble.media_obj}}{% if scrobble.log.title  %} - {{ scrobble.log.title }}{% endif %}</a>
                         {% elif scrobble.life_event %}
                         <a href="{% url 'lifeevents:lifeevent_detail' scrobble.life_event.uuid %}">{{ scrobble.life_event.title }}</a>
                         {% elif scrobble.mood %}