diff --git a/lib/chess_web/templates/game/_board.html.eex b/lib/chess_web/templates/game/_board.html.eex
index e7c94a5..fa55c3c 100644
--- a/lib/chess_web/templates/game/_board.html.eex
+++ b/lib/chess_web/templates/game/_board.html.eex
@@ -1,4 +1,4 @@
-<div class="board board--black-to-move board--player-is-white">
+<div class="board board--black-to-move board--player-is-<%= player_colour(@conn, @game) %>">
   <div class="board__rank-labels">
     <div class="board__label">1</div>
     <div class="board__label">2</div>
@@ -24,9 +24,9 @@
       <div class="board__row">
         <%= for file <- 0..7 do %>
           <%= render "_square.html",
-              rank: rank,
-              file: file,
-              piece: @game.board["#{file},#{rank}"] %>
+            rank: rank,
+            file: file,
+            piece: @game.board["#{file},#{rank}"] %>
         <% end %>
       </div>
     <% end %>
diff --git a/lib/chess_web/templates/game/show.html.eex b/lib/chess_web/templates/game/show.html.eex
index 87adea1..2e4b490 100644
--- a/lib/chess_web/templates/game/show.html.eex
+++ b/lib/chess_web/templates/game/show.html.eex
@@ -2,7 +2,10 @@
   <div class="game-grid">
     <%= render "_board.html", conn: @conn, game: @game %>
     <div class="game-info">
-      <p>Playing Zaphod Beeblebrox <img class="game-info__opponent-status" src="/images/eye-closed.svg" alt="offline"></p>
+      <p>
+        Playing <%= opponent(@game, current_user(@conn).id).name %>
+        <img class="game-info__opponent-status" src="/images/eye-closed.svg" alt="offline">
+      </p>
     </div>
     <div class="move-list">
       <table class="table table--condensed">