diff --git a/web/index.templ b/web/index.templ
index c8216b1..490cb10 100644
--- a/web/index.templ
+++ b/web/index.templ
@@ -67,23 +67,27 @@ templ Index(curSong *radio.Song, sl []radio.Song, slLen int64, lstnrs *radio.Lis
                 Your browser doesn't support an audio element, it's sad... But you always can take the <a href="/playlist">playlist</a>!
             </audio>
             <div>
-            if curSong != nil && curSong.Artist != "" {
                 <p>
-                    <img src="/assets/img/listener.svg" alt="Listeners" title="Listeners" /> <span id="radio-listeners">{ strconv.FormatInt(lstnrs.Current(), 10) }</span>
-                    <img src="/assets/img/duration.svg" alt="Duration" title="Duration" /> <span id="radio-duration-estimate"></span><span id="radio-duration">{ curSong.DurationString() }</span>
+                    <img src="/assets/img/listener.svg" alt="Listeners" title="Listeners" />
+                    <span id="radio-listeners">{ strconv.FormatInt(lstnrs.Current(), 10) }</span>
+                    <img src="/assets/img/duration.svg" alt="Duration" title="Duration" />
+                    <span id="radio-duration-estimate"></span>
+                    <span id="radio-duration">
+                        if curSong != nil && curSong.Artist != "" {
+                            { curSong.DurationString() }
+                        } else {
+                            0:00
+                        }
+                    </span>
                 </p>
                 <p>
-                    <img src="/assets/img/note.svg" /> <span id="radio-song">{ curSong.Artist } - { curSong.Title }</span>
+                    <img src="/assets/img/note.svg" />
+                    <span id="radio-song">
+                        if curSong != nil && curSong.Artist != "" {
+                            { curSong.Artist } - { curSong.Title }
+                        }
+                    </span>
                 </p>
-            } else {
-                <p>
-                    <img src="/assets/img/listener.svg" alt="Listeners" title="Listeners" /> <span id="radio-listeners">{ strconv.FormatInt(lstnrs.Current(), 10) }</span>
-                    <img src="/assets/img/duration.svg" alt="Duration" title="Duration" /> <span id="radio-duration-estimate"></span><span id="radio-duration">0:00</span>
-                </p>
-                <p>
-                    <img src="/assets/img/note.svg" alt="Song" title="Song" /> <span id="radio-song"></span>
-                </p>
-            }
             </div>
         </div>
     </section>
@@ -98,17 +102,17 @@ templ Index(curSong *radio.Song, sl []radio.Song, slLen int64, lstnrs *radio.Lis
                 </tr>
             </thead>
             <tbody>
-        for _, song := range sl {
-            <tr>
-                <td>{ utils.ToClientTimezone(song.StartAt, r).Format("15:04") }</td>
-                if song.PeakListeners != 0 {
-                    <td>{ strconv.FormatInt(song.Listeners, 10) }/{ strconv.FormatInt(song.PeakListeners, 10) }</td>
-                } else {
-                    <td></td>
+                for _, song := range sl {
+                    <tr>
+                        <td>{ utils.ToClientTimezone(song.StartAt, r).Format("15:04") }</td>
+                        <td>
+                            if song.PeakListeners != 0 {
+                                { strconv.FormatInt(song.Listeners, 10) }/{ strconv.FormatInt(song.PeakListeners, 10) }
+                            }
+                        </td>
+                        <td>{ song.Artist } - { song.Title }</td>
+                    </tr>
                 }
-                <td>{ song.Artist } - { song.Title }</td>
-            </tr>
-        }
             </tbody>
         </table>
     </section>