diff --git a/resources/views/partials/head.blade.php b/resources/views/partials/head.blade.php
index de5b464..333b6d1 100644
--- a/resources/views/partials/head.blade.php
+++ b/resources/views/partials/head.blade.php
@@ -10,7 +10,7 @@
 
     <link rel="license" href="https://creative-commons.org/publicdomain/zero/1.0/">
     <link rel="me" href="mailto:track@bengoldsworthy.net">
-    <link rel="icon" sizes="32x32" href="/images/icon.png">
+    <link rel="icon" sizes="32x32" href="/images/favicon.png">
 
     <link rel="stylesheet" href="https://unpkg.com/leaflet@1.8.0/dist/leaflet.css"
         integrity="sha512-hoalWLoI8r4UszCkZ5kL8vayOGVae1oxXe/2A4AO6J9+580uKHDO3JdHb7NzwwzK5xr/Fs0W40kiNHxM9vyTtQ=="
diff --git a/resources/views/tracker.blade.php b/resources/views/tracker.blade.php
index 1a074b8..c8e0f69 100644
--- a/resources/views/tracker.blade.php
+++ b/resources/views/tracker.blade.php
@@ -42,13 +42,15 @@
                     <li>
                         <details class="checkin" id="{{ $checkin->id }}" ontoggle="toggleCheckin(this.open, this.id)">
                             <summary class="checkin__summary">
-                                <h2 class="checkin__title">{{ $checkin->title ?? "[No title]" }}</h2>
+                                <h2 class="checkin__title">{!! $checkin->title ?? "<i>Untitled</i>" !!}</h2>
                                 <p class="checkin__meta">{!! render_date_difference($checkin->date) !!}</p>
                             </summary>
-                            {{ $checkin->note ?? "[No note]" }}
-    @if($checkin->image_url)
-    <img class="popup__image" loading="lazy" src="{{ $checkin->image_url }}">
-    @endif
+                            @if($checkin->note)
+                            {!! $checkin->note !!}
+                            @endif
+                            @if($checkin->image_url)
+                            <img class="popup__image" loading="lazy" src="{{ $checkin->image_url }}">
+                            @endif
                         </details>
                     </li>
                 @endforeach
@@ -90,8 +92,8 @@
                 @foreach($trip->checkins as $checkin)
                 marker = L.marker([{{ $checkin->location->latitude }}, {{ $checkin->location->longitude }}]).addTo(map);
                 
-                popupMarkup = '<h2 class="popup__title">{{ $checkin->title ?? "No Title" }}</h2>';
-                popupMarkup += `<p class="popup__note">{{ $checkin->note }}</p>`;
+                popupMarkup = `<h2 class="popup__title">{!! $checkin->title ?? "<i>Untitled</i>" !!}</h2>`;
+                popupMarkup += `<p class="popup__note">{!! $checkin->note !!}</p>`;
                 popupMarkup += '<img class="popup__image" src="{{ $checkin->image_url }}">';
                 marker.bindPopup(popupMarkup).openPopup();