diff --git a/app/views/analyse/replay.scala.html b/app/views/analyse/replay.scala.html
index 63ea903e66..6eccded8ce 100644
--- a/app/views/analyse/replay.scala.html
+++ b/app/views/analyse/replay.scala.html
@@ -76,16 +76,16 @@ moreJs = moreJs) {
 <a href="http://www.chessgames.com/perl/chessopening?eco=@o.code">@o.code @o.name</a>
 }.getOrElse { "Unknown" }
 <nav>
+@if(canRequestAnalysis && game.finished && analysis.isEmpty) {
+<form class="request_analysis" action="@routes.Analyse.computer(gameId, color.name)" method="post">
+  <a>Request a computer analysis</a>
+</form>
 <a href="@routes.Analyse.stats(gameId)">@trans.viewGameStats()</a>
 <br />
 <a class="rotate_board" href="@routes.Analyse.replay(gameId, (!color).name)">@trans.flipBoard()</a>
 <br />
 <a class="view_pgn_toggle" href="@routes.Analyse.pgn(game.id)">View PGN</a>
-<br />
-@if(canRequestAnalysis && game.finished && analysis.isEmpty) {
-<form class="request_analysis" action="@routes.Analyse.computer(gameId, color.name)" method="post">
-  <a>Request a computer analysis</a>
-</form>
+<div id="CurrentFen"></div>
 }
 </nav>
 }
diff --git a/app/views/game/more.scala.html b/app/views/game/more.scala.html
index d71e0a51a1..a8cfaf96a7 100644
--- a/app/views/game/more.scala.html
+++ b/app/views/game/more.scala.html
@@ -2,6 +2,8 @@
 
 @import pov._
 
+@bookmarkerLink(user: User) = {<a href="@routes.User.show(user.username)">@user.username</a>}
+
 @defining("http://lichess.org" + routes.Round.watcher(gameId, color.name)) { url =>
 <div class="undergame_box game_more">
   <div class="more_top">
@@ -13,13 +15,11 @@
   </div>
   <div class="inner game_extra">
     @if(bookmarkers.nonEmpty) {
-    <div class="bookmarkers">
+    <div class="bookmarkers inline_userlist">
       <p>@trans.bookmarkedByNbPlayers(bookmarkers.size)</p>
-      <ul>
-        @bookmarkers.map { bookmarker =>
-        <li>@userLink(bookmarker)</li>
-        }
-      </ul>
+      <span class="list">
+        @Html(bookmarkers.map(bookmarkerLink).mkString(", "))
+      </span>
     </div>
     }
     <div class="body">
diff --git a/app/views/round/player.scala.html b/app/views/round/player.scala.html
index 415b390c62..72ae83ee7f 100644
--- a/app/views/round/player.scala.html
+++ b/app/views/round/player.scala.html
@@ -5,7 +5,7 @@
 @title = @{ "Play %s - %s".format(gameId, color) }
 
 @underchat = {
-<div class="watchers">
+<div class="watchers inline_userlist">
   @trans.spectators() <span class="list"></span>
 </div>
 }
diff --git a/app/views/round/watcher.scala.html b/app/views/round/watcher.scala.html
index 4fddba8746..66da18935a 100644
--- a/app/views/round/watcher.scala.html
+++ b/app/views/round/watcher.scala.html
@@ -5,7 +5,7 @@
 @title = @{ "Watch %s - %s".format(gameId, color) }
 
 @underchat = {
-<div class="watchers">
+<div class="watchers inline_userlist">
   @trans.spectators() <span class="list"></span>
 </div>
 }
diff --git a/public/javascripts/analyse.js b/public/javascripts/analyse.js
index 497ccf28c1..fba78249ea 100644
--- a/public/javascripts/analyse.js
+++ b/public/javascripts/analyse.js
@@ -84,6 +84,7 @@ function customFunctionOnMove() {
       $gameText.scrollTop($gameText.scrollTop() + y + height * 4 - 512);
     }
   }
+  $('#CurrentFen').text(CurrentFEN());
 }
 
 function redrawBoardMarks() {
diff --git a/public/stylesheets/analyse.css b/public/stylesheets/analyse.css
index ced78908ac..fb53226e1a 100644
--- a/public/stylesheets/analyse.css
+++ b/public/stylesheets/analyse.css
@@ -71,6 +71,7 @@ span.board_mark.horz {
   width: 100px;
   height: 2em;
 }
+
 #GameText {
   font-size: 1.4em;
   width: 220px;
diff --git a/public/stylesheets/board.css b/public/stylesheets/board.css
index f5aa3d461a..70812d0051 100644
--- a/public/stylesheets/board.css
+++ b/public/stylesheets/board.css
@@ -701,15 +701,15 @@ div.lichess_chat.hidden ol.lichess_messages, div.lichess_chat.hidden form {
   opacity: 0;
 }
 
-div.watchers span.list {
+div.inline_userlist span.list {
   display: inline;
   color: #9a9a9a;
 }
-div.watchers a {
+div.inline_userlist a {
   color: #aaa;
   text-decoration: none;
   font-weight: bold;
 }
-div.watchers a:hover {
+div.inline_userlist a:hover {
   text-decoration: underline;
 }
diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index 6ee7780d30..15f91c9d89 100644
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -684,15 +684,10 @@ div.game_more textarea {
 div.game_extra {
   border-top: 1px solid #ccc;
 }
-div.game_extra div.body {
-  width: 60%;
-}
 
 div.game_extra div.bookmarkers {
   float: right;
-}
-div.game_extra div.bookmarkers li {
-  margin-top: 5px;
+  max-width: 48%;
 }
 
 span.bookmark {