diff --git a/vrobbler/apps/scrobbles/views.py b/vrobbler/apps/scrobbles/views.py
index 1ae2979..0ff66c8 100644
--- a/vrobbler/apps/scrobbles/views.py
+++ b/vrobbler/apps/scrobbles/views.py
@@ -868,7 +868,6 @@ class ScrobbleDetailView(DetailView):
             related_scrobbles = (
                 Scrobble.objects.filter(user=user)
                 .filter(**{fk_field: media_obj})
-                .exclude(id=self.object.id)
                 .order_by("-timestamp")
             )
         else:
diff --git a/vrobbler/templates/scrobbles/scrobble_detail.html b/vrobbler/templates/scrobbles/scrobble_detail.html
index 42cad5e..57c2961 100644
--- a/vrobbler/templates/scrobbles/scrobble_detail.html
+++ b/vrobbler/templates/scrobbles/scrobble_detail.html
@@ -10,8 +10,16 @@
 
 <div class="row">
 
-<h1>{{ object.media_obj }} - {{object.media_type}}</h1>
-<h2 class="text-muted">{{ object.local_timestamp }}</h2>
+<h1>
+{% if object.media_type == "Video" %}🎬{% elif object.media_type == "Track" %}🎵{% elif object.media_type == "PodcastEpisode" %}🎙️{% elif object.media_type == "SportEvent" %}⚽{% elif object.media_type == "Book" %}📚{% elif object.media_type == "Paper" %}📄{% elif object.media_type == "VideoGame" %}🎮{% elif object.media_type == "BoardGame" %}🎲{% elif object.media_type == "GeoLocation" %}📍{% elif object.media_type == "Trail" %}🥾{% elif object.media_type == "Beer" %}🍺{% elif object.media_type == "Puzzle" %}🧩{% elif object.media_type == "Food" %}🍔{% elif object.media_type == "Task" %}✅{% elif object.media_type == "WebPage" %}🌐{% elif object.media_type == "LifeEvent" %}🎉{% elif object.media_type == "Mood" %}😊{% elif object.media_type == "BrickSet" %}🧱{% endif %}
+{{ object.media_obj }}</h1>
+{% if object.media_type == "Task" and object.logdata.title %}
+<h2>{{ object.logdata.title }}</h2>
+{% endif %}
+<h3 class="text-muted">{{ object.local_timestamp }}</h3>
+{% if object.media_type == "Task" and object.logdata.description %}
+<p>{{ object.logdata.description }}</p>
+{% endif %}
 
 {% with notes_html=object.logdata.notes_as_html %}
 {% if notes_html %}
@@ -58,7 +66,7 @@
   </form>
 </div>
 
-<h2 class="mt-4">Other Scrobbles of This Media</h2>
+<h2 class="mt-4">All scrobbles of this {{ object.media_type|lower }}</h2>
 {% if related_scrobbles %}
 <p class="text-muted">{{ related_scrobbles.paginator.count }} scrobble{{ related_scrobbles.paginator.count|pluralize }}</p>
 <table class="table table-striped table-sm">
@@ -71,8 +79,8 @@
     </thead>
     <tbody>
         {% for scrobble in related_scrobbles %}
-        <tr>
-            <td><a href="{% url 'scrobbles:detail' scrobble.uuid %}">{{ scrobble.timestamp|date:"M d, Y" }}</a></td>
+        <tr{% if scrobble.id == object.id %} class="table-active fw-bold"{% endif %}>
+            <td>{% if scrobble.id == object.id %}{{ scrobble.timestamp|date:"M d, Y" }}{% else %}<a href="{% url 'scrobbles:detail' scrobble.uuid %}">{{ scrobble.timestamp|date:"M d, Y" }}</a>{% endif %}</td>
             <td>
                 {% if scrobble.media_type == "Task" and scrobble.logdata.title %}{{ scrobble.media_obj.title }}: {{ scrobble.logdata.title }}{% else %}{{ scrobble.media_obj.title|default:scrobble.media_obj }}{% endif %}
             </td>