diff --git a/sections/forums/poll_vote.php b/sections/forums/poll_vote.php
index 2045753ae..5b5698f61 100644
--- a/sections/forums/poll_vote.php
+++ b/sections/forums/poll_vote.php
@@ -10,10 +10,10 @@ namespace Gazelle;
 $threadId = (int)($_POST['threadid'] ?? 0);
 $poll = new Manager\ForumPoll()->findById($threadId);
 if (is_null($poll)) {
-    Error404::error();
+    Error404::error("No reference to that poll found");
 }
 if ($poll->isClosed()) {
-    Error403::error();
+    Error403::error("Sorry, the poll is closed");
 }
 
 $answerList = $poll->answerList();
@@ -24,12 +24,12 @@ if (!isset($_POST['vote']) || !is_number($_POST['vote'])) {
 <form class="vote_form" name="poll" id="poll" action="">
     <input type="hidden" name="action" value="poll" />
     <input type="hidden" name="auth" value="<?= $Viewer->auth() ?>" />
-    <input type="hidden" name="threadid" value="<?= $poll->id() ?>" />
+    <input type="hidden" name="threadid" value="<?= $poll->id ?>" />
 <?php foreach ($answerList as $i => $answer) { ?>
     <input type="radio" name="vote" id="answer_<?=$i?>" value="<?=$i?>" />
     <label for="answer_<?=$i?>"><?=display_str($answer)?></label><br />
 <?php } ?>
-    <br /><input type="radio" name="vote" id="answer_0" value="0" /> <label for="answer_0">Blank&#8202;&mdash;&#8202;Show the results!</label><br /><br />
+    <br /><input type="radio" name="vote" id="answer_0" value="0" /> <label for="answer_0">Blank&nbsp;&mdash;&nbsp;Show the results!</label><br /><br />
     <input type="button" onclick="ajax.post('index.php', 'poll', function(response) { $('#poll_container').raw().innerHTML = response });" value="Vote" />
 </form>
 <?php
@@ -43,58 +43,53 @@ if (!isset($_POST['vote']) || !is_number($_POST['vote'])) {
 ?>
         <ul class="poll nobullet" id="poll_options">
 <?php
-        if ($poll->hasRevealVotes()) {
-            $totalStaff = 0;
-            $totalVoted = 0;
-            $staffVote = $poll->staffVote(new Manager\User());
-            $staffVoteReordered = array_slice($staffVote, 1, null, true) + [0 => $staffVote[0]];
-            foreach ($staffVoteReordered as $response => $info) {
-                if ($response !== 'missing') {
-                    $totalStaff += count($info['who']);
-                    $totalVoted += count($info['who']);
+    if ($poll->hasRevealVotes()) {
+        $totalStaff = 0;
+        $totalVoted = 0;
+        $staffVote = $poll->staffVote(new Manager\User());
+        $staffVoteReordered = array_slice($staffVote, 1, null, true) + [0 => $staffVote[0]];
+        foreach ($staffVoteReordered as $response => $info) {
+            if ($response !== 'missing') {
+                $totalStaff += count($info['who']);
+                $totalVoted += count($info['who']);
 ?>
-                <li><a href="forums.php?action=change_vote&amp;threadid=<?= $poll->id() ?>&amp;auth=<?= $Viewer->auth() ?>&amp;vote=<?= $response ?>"><?=empty($info['answer']) ? 'Abstain' : display_str($info['answer'])?></a> <?=
-                    count ($info['who']) ? (" \xE2\x80\x93 " . implode(', ', array_map(fn($u) => $u->link(), $info['who']))) : "<i>none</i>"
-                ?></li>
-<?php
-                }
-            }
-            if (count($staffVote['missing']['who'])) {
-                $totalStaff += count($staffVote['missing']['who']);
-?>
-                <br /><li>Missing: <?= implode(', ', array_map(fn($u) => $u->link(), $staffVote['missing']['who'])) ?></li>
+            <li><a href="forums.php?action=change_vote&amp;threadid=<?= $poll->id ?>&amp;auth=<?= $Viewer->auth() ?>&amp;vote=<?= $response ?>"><?=empty($info['answer']) ? 'Abstain' : display_str($info['answer'])?></a> <?=
+                count ($info['who'])
+                    ? (" – " . implode(', ', array_map(fn ($u) => $u->link(), $info['who'])))
+                    : "<i>none</i>"
+            ?></li>
 <?php
             }
+        }
+        if (count($staffVote['missing']['who'])) {
+            $totalStaff += count($staffVote['missing']['who']);
 ?>
+            <li><br />Missing: <?= implode(', ', array_map(fn ($u) => $u->link(), $staffVote['missing']['who'])) ?></li>
+<?php } ?>
         </ul>
         <br />
         <strong>Voted:</strong> <?= number_format($totalVoted) ?> of <?= number_format($totalStaff) ?> total. (You may click on a choice to change your vote).
         <br />
         <a href="#" onclick="AddPollOption(<?= $threadId ?>); return false;" class="brackets">+</a>
 <?php
-        } else {
-            foreach ($answerList as $i => $answer) {
-                $choice = $vote[$i];
+    } else {
+        foreach ($answerList as $i => $answer) {
+            $choice = $vote[$i];
 ?>
-                    <li><?=$response === $i ? '&raquo; ' : ''?><?=display_str($answer)?> (<?=number_format($choice['percent'], 2)?>%)</li>
-                    <li class="graph">
-                        <span class="left_poll"></span>
-                        <span class="center_poll" style="width: <?=number_format($choice['ratio'], 2)?>%;"></span>
-                        <span class="right_poll"></span>
-                    </li>
+            <li><?=$response === $i ? '➔ ' : ''?><?=display_str($answer)?> (<?=number_format($choice['percent'], 1)?>%)</li>
+            <li class="graph">
+                <span class="left_poll"></span>
+                <span class="center_poll" style="width: <?=number_format($choice['ratio'], 1)?>%;"></span>
+                <span class="right_poll"></span>
+            </li>
 <?php
-            }
-            if ($response === 0) {
-?>
-            <br /><li>&raquo; (Abstain)</li>
-<?php
-            }
+       }
+       if ($response === 0) {
 ?>
+            <li><br />➔ (Abstain)</li>
+<?php   } ?>
         </ul>
         <br /><strong>Votes:</strong> <?= number_format($poll->total()) ?>
 <?php
-        }
-?>
-
-<?php
+    }
 }
diff --git a/templates/index/private-sidebar.twig b/templates/index/private-sidebar.twig
index 4452d5438..0f7986ea7 100644
--- a/templates/index/private-sidebar.twig
+++ b/templates/index/private-sidebar.twig
@@ -31,20 +31,20 @@
 {% endif %}
 
 {% if viewer.permitted('users_mod') %}
-    {% set read = staff_blog.readBy(viewer) %}
+{%  set read = staff_blog.readBy(viewer) %}
 <div class="box">
     <div class="head colhead_dark">
         <strong><a href="staffblog.php">Latest staff blog posts</a></strong>
     </div>
     <ul class="stats nobullet">
-    {% for article in staff_blog.blogList[0:5] %}
-        {% set unread = read < article.epoch %}
+{%  for article in staff_blog.blogList[0:5] %}
+{%      set unread = read < article.epoch %}
         <li>
-            {%- if unread %}<strong>{% endif -%}
+{%-     if unread %}<strong>{% endif -%}
             <a href="staffblog.php#blog{{ article.id }}">{{ article.title }}</a>
-            {%- if unread %}</strong>{% endif -%}
+{%-     if unread %}</strong>{% endif -%}
         </li>
-    {% endfor %}
+{%  endfor %}
     </ul>
 </div>
 {% endif %}
@@ -53,106 +53,109 @@
     <div class="head colhead_dark"><strong><a href="blog.php">Latest blog posts</a></strong></div>
     <ul class="stats nobullet">
 {% for article in blog.headlines[0:5] %}
-        <li>
-            {{ article.link|raw }}
-        </li>
+        <li>{{ article.link|raw }}</li>
 {% endfor %}
     </ul>
 </div>
 
-{% if leaderboard %}
+{% for entry in leaderboard %}
+{%  if loop.first %}
 <div class="box">
     <div class="head colhead_dark"><strong>Contest Leaderboard</strong></div>
     <table>
-    {% for entry in leaderboard %}
+{%  endif %}
         <tr>
             <td>{{ loop.index }}</td>
             <td>{{ entry.user_id|user_url }}</td>
             <td>{{ entry.entry_count|number_format }}</td>
         </tr>
-        {% if loop.last and contest_rank %}
-            {% if contest_rank.position > 4 %}
+{%  if loop.last and contest_rank %}
+{%      if contest_rank.position > 4 %}
         <tr>
             <td colspan="3"><hr /></td>
         </tr>
-            {% endif %}
-            {% if contest_rank.position > 3 %}
+{%      endif %}
+{%      if contest_rank.position > 3 %}
         <tr>
             <td>{{ contest_rank.position|number_format }}</td>
             <td>{{ viewer.id|user_url }}</td>
             <td>{{ contest_rank.total|number_format }}</td>
         </tr>
-            {% endif %}
-        {% endif %}
-    {% endfor %}
+{%      endif %}
+{%  endif %}
+{%  if loop.last %}
     </table>
     <div class="center pad">
         <a href="contest.php?action=leaderboard"><em>View More</em></a>
     </div>
 </div>
-{% endif %}
-
-{%- if poll -%}
+{%  endif %}
+{% endfor %}
+{% if poll %}
 <div class="box">
-    <div class="head colhead_dark"><strong><a href="forums.php?action=viewthread&amp;threadid={{ poll.id }}">Latest Poll &#x1F5F3;</a>{% if poll.isClosed %} [Closed]{% endif %}</strong></div>
+    <div class="head colhead_dark"><strong><a href="forums.php?action=viewthread&amp;threadid={{
+        poll.id }}">Latest Poll 🗳</a>{% if poll.isClosed %} [Closed]{% endif %}</strong></div>
     <div class="pad">
         <p><strong>{{ poll.question }}</strong></p>
-    {% if poll.response(viewer) is not null %}
+{%  if poll.response(viewer) is not null %}
         <ul class="poll nobullet">
-        {% for id, answer in poll.answerList %}
-            {% set choice = poll.vote[id] %}
+{%      for id, answer in poll.answerList %}
+{%          set choice = poll.vote[id] %}
             <li title="{{ choice.score }}">
-            {%- if id == poll.response(viewer) %}&raquo;&nbsp;{% endif -%}
-            {{ answer }} ({{ choice.percent|number_format(2) }}%)</li>
+{%-         if id == poll.response(viewer) %}<span title="You voted for this">➔ {% endif %}{{ answer }}</span> ({{
+                choice.percent|number_format(1) }}%)</li>
             <li title="{{ choice.score }}" class="graph">
                 <span class="left_poll"></span>
-                <span class="center_poll" style="width: {{ choice.ratio|number_format(2) }}%;"></span>
+                <span class="center_poll" style="width: {{ choice.ratio|number_format(1) }}%;"></span>
                 <span class="right_poll"></span>
             </li>
-
-        {% endfor %}
-        {% if poll.response(viewer) == 0 %}
+{%      endfor %}
+{%      if poll.response(viewer) == 0 %}
             <br />
-            <li>&raquo; (Abstain)</li>
-        {% endif %}
+            <li title="You abstained">➔ (Abstain)</li>
+{%      endif %}
         </ul>
         <br /><strong>Votes:</strong> {{ poll.total|number_format }}<br />
-    {% else %}
+{%  else %}
         <div id="poll_container">
         <form class="vote_form" name="poll" id="poll" action="">
             <input type="hidden" name="action" value="poll" />
             <input type="hidden" name="auth" value="{{ viewer.auth }}" />
             <input type="hidden" name="threadid" value="{{ poll.id }}" />
-        {% for id, answer in poll.answerList %}
+{%      for id, answer in poll.answerList %}
             <input type="radio" name="vote" id="answer_{{ id }}" value="{{ id }}" />
             <label for="answer_{{ id }}">{{ answer }}</label><br />
-        {% endfor %}
-            <br /><input type="radio" name="vote" id="answer_0" value="0" /> <label for="answer_0">Blank&#8202;&mdash;&#8202;Show the results!</label><br /><br />
+{%      endfor %}
+            <br /><input type="radio" name="vote" id="answer_0" value="0" /> <label for="answer_0">Blank&nbsp;&mdash;&nbsp;Show the results!</label><br /><br />
             <input type="button" onclick="ajax.post('index.php', 'poll', function(response) { $('#poll_container').raw().innerHTML = response } );" value="Vote" />
         </form>
         </div>
-    {% endif %}
+{%  endif %}
     </div>
 </div>
-{% endif -%}
-
+{% endif %}
 <div class="box">
     <div class="head colhead_dark"><strong>Stats</strong></div>
     <ul class="stats nobullet">
 {% if constant('USER_LIMIT') > 0 %}
-    {% set user_count = user_stats.enabledUserTotal %}
+{%  set user_count = user_stats.enabledUserTotal %}
         <li>Maximum users: {{ constant('USER_LIMIT')|number_format }}</li>
 {% endif %}
-        <li>Enabled users: {{ user_count|number_format }} <a href="stats.php?action=users" class="brackets">Details</a></li>
-        <li>Users active today: {{ user_stats.dayActiveTotal }} ({{ (user_stats.dayActiveTotal / user_count * 100)|number_format(2) }}%)</li>
-        <li>Users active this week: {{ user_stats.weekActiveTotal }} ({{ (user_stats.weekActiveTotal / user_count * 100)|number_format(2) }}%)</li>
-        <li>Users active this month: {{ user_stats.monthActiveTotal }} ({{ (user_stats.monthActiveTotal / user_count * 100)|number_format(2) }}%)</li>
+        <li>Enabled users: {{ user_count|number_format
+            }} <a href="stats.php?action=users" class="brackets">Details</a></li>
+        <li>Users active today: {{ user_stats.dayActiveTotal|number_format }} ({{
+            (user_stats.dayActiveTotal / user_count * 100)|number_format(1) }}%)</li>
+        <li>Users active this week: {{ user_stats.weekActiveTotal|number_format }} ({{
+            (user_stats.weekActiveTotal / user_count * 100)|number_format(1) }}%)</li>
+        <li>Users active this month: {{ user_stats.monthActiveTotal|number_format }} ({{
+            (user_stats.monthActiveTotal / user_count * 100)|number_format(1) }}%)</li>
         <li>Torrents: {{ torrent_stats.torrentTotal|number_format }}</li>
         <li>Releases: {{ torrent_stats.albumTotal|number_format }}</li>
         <li>Artists: {{ torrent_stats.artistTotal|number_format }}</li>
         <li>"Perfect" FLACs: {{ torrent_stats.perfectFlacTotal|number_format }}</li>
         <li>Collages: {{ collage_count|number_format }}</li>
-        <li>Requests: {{ request_stats.total|number_format }} ({{ request_stats.filledPercent|number_format(2) }}% filled)</li>
+        <li>Requests: {{ request_stats.total|number_format }} ({{
+            request_stats.filledPercent|number_format(1) }}% filled)</li>
         <li>Snatches: {{ user_stats.snatchTotal|number_format }}</li>
         <li>Peers: {{ user_stats.peerTotal|number_format }}</li>
         <li>Seeders: {{ user_stats.seederTotal|number_format }}</li>