diff --git a/marietje/queues/templates/queues/queue.html b/marietje/queues/templates/queues/queue.html
index 4fe9707..ce41525 100644
--- a/marietje/queues/templates/queues/queue.html
+++ b/marietje/queues/templates/queues/queue.html
@@ -43,22 +43,22 @@
                 <template v-if="infobar !== null && 'start_personal_queue' in infobar && infobar.start_personal_queue !== null">
                     <li v-if="infobar.start_personal_queue !== 0" class="nav-item me-3">
                         <p v-if="infobar.plays_in" class="navbar-text mb-0 start-queue hidden-sm hidden-xs">
-                            First song starts in ${infobar.start_personal_queue.secondsToMMSS() }$
+                            First song starts in ${ infobar.start_personal_queue.secondsToMMSS() }$
                         </p>
                         <p v-else class="navbar-text mb-0 start-queue hidden-sm hidden-xs">
-                            First song starts at ${(infobar.now_in_seconds + infobar.start_personal_queue).timestampToHHMMSS() }$
+                            First song starts at ${ (infobar.now_in_seconds + infobar.start_personal_queue).timestampToHHMMSS() }$
                         </p>
                     </li>
                     <li class="nav-item me-3">
                         <p v-if="infobar.plays_in" class="navbar-text mb-0 start-queue hidden-sm hidden-xs">
-                            Last song ends in ${infobar.end_personal_queue.secondsToMMSS() }$
+                            Last song ends in ${ infobar.end_personal_queue.secondsToMMSS() }$
                         </p>
                         <p v-else class="navbar-text mb-0 start-queue hidden-sm hidden-xs">
-                            Last song ends at ${(infobar.now_in_seconds + infobar.end_personal_queue).timestampToHHMMSS() }$
+                            Last song ends at ${ (infobar.now_in_seconds + infobar.end_personal_queue).timestampToHHMMSS() }$
                         </p>
                     </li>
                     <li class="nav-item">
-                        <p class="navbar-text mb-0 duration-queue" v-bind:class="{danger: infobar.length_personal_queue > infobar.max_length * 60}">(${infobar.length_personal_queue.secondsToMMSS() }$)</p>
+                        <p class="navbar-text mb-0 duration-queue" v-bind:class="{danger: infobar.length_personal_queue > infobar.max_length * 60}">(${ infobar.length_personal_queue.secondsToMMSS() }$)</p>
                     </li>
                 </template>
             </ul>
@@ -87,22 +87,22 @@
                         <tbody class="queuebody">
                         <template v-for="(song, index) in queue">
                             <tr :class="{ marietjequeue: (song.user === null), currentsong: (index === 0), 'fw-bold': (index === 0) }">
-                                <td class="artist">${song.song.artist }$</td>
-                                <td class="title">${song.song.title }$</td>
+                                <td class="artist">${ song.song.artist }$</td>
+                                <td class="title">${ song.song.title }$</td>
                                 <td class="d-sm-table-cell d-none requested-by">
                                     <template v-if="song.user === null">
                                         Marietje
                                     </template>
                                     <template v-else>
-                                        ${song.user.name }$
+                                        ${ song.user.name }$
                                     </template>
                                 </td>
                                 <td class="d-sm-table-cell d-none plays-at" style="text-align: right">
                                     <template v-if="song.time_until_song_seconds !== null && song.time_until_song_seconds > 0 && playsIn === true">
-                                        ${song.time_until_song_seconds.secondsToMMSS() }$
+                                        ${ song.time_until_song_seconds.secondsToMMSS() }$
                                     </template>
                                     <template v-else-if="playsIn === false && song.plays_at !== null && song.played === false">
-                                        ${song.plays_at.timestampToHHMMSS() }$
+                                        ${ song.plays_at.timestampToHHMMSS() }$
                                     </template>
                                 </td>
                                 <td>
@@ -178,7 +178,7 @@
                                 </select>
                                 <select class="pagenum input-mini" title="Select page number" v-model="page_number">
                                     <template v-for="(i, index) in number_of_pages">
-                                        <option :value="i">${i }$</option>
+                                        <option :value="i">${ i }$</option>
                                     </template>
                                 </select>
                             </th>
@@ -189,26 +189,26 @@
                         <template v-for="(song, index) in songs">
                             <tr>
                                 <td>
-                                    ${song.artist }$
+                                    ${ song.artist }$
                                 </td>
                                 <td>
-                                    <a href="#" v-on:click="request_song(song.id);">${song.title }$</a>
+                                    <button v-on:click="request_song(song.id);" class="btn btn-link p-0 text-decoration-none">${ song.title }$</button>
                                 </td>
                                 <td>
                                     <template v-if="song.user === null">
                                         Marietje
                                     </template>
                                     <template v-else>
-                                        ${song.user.name }$
+                                        ${ song.user.name }$
                                     </template>
                                 </td>
                                 <td>
-                                    ${song.duration.secondsToMMSS() }$
+                                    ${ song.duration.secondsToMMSS() }$
                                 </td>
                                 <td>
-                                    <a href="#" v-on:click="report_song(song.id);">
+                                    <button v-on:click="report_song(song.id);" class="btn btn-link p-0 text-decoration-none">
                                         ⚑
-                                    </a>
+                                    </button>
                                 </td>
                             </tr>
                         </template>