diff --git a/templates/main.html b/templates/main.html
index a365ddb..31757e4 100644
--- a/templates/main.html
+++ b/templates/main.html
@@ -2,6 +2,9 @@
     <head>
         <title>{% block title %}Wer bin ich{% endblock %}</title>
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <style>
+            .current_player_indicator { font-size: x-large; }
+        </style>
     </head>
     <body>
         {% block content %}{% endblock %}
diff --git a/templates/name_edit.html b/templates/name_edit.html
index 8621f4b..fc9407f 100644
--- a/templates/name_edit.html
+++ b/templates/name_edit.html
@@ -3,15 +3,18 @@
 {% block content %}
 
 <h1>Choose a name</h1>
-<h2>You are: {{ current_player }}</h2>
+
+<div class=current_player_indicator>You are: {{ current_player }}</div>
 
 <p>
 Please name your player:
 <br/>
 <form method=post>
+<table>
 {% for player in other_players %}
-{{ player }}: <input type=text name={{ player }} /><br/>
+<tr><td>{{ player }}</td><td><input type=text name={{ player }} /></td></tr>
 {% endfor %}
+</table>
 <input type=submit />
 </form>
 </p>
diff --git a/templates/name_show.html b/templates/name_show.html
index 2ed4725..8b99796 100644
--- a/templates/name_show.html
+++ b/templates/name_show.html
@@ -3,7 +3,7 @@
 {% block content %}
 
 <h1>Play!</h1>
-<h2>You are: {{ current_player }}</h2>
+<div class=current_player_indicator>You are: {{ current_player }}</div>
 
 <p>
 <table>
@@ -13,4 +13,8 @@
 </table>
 </p>
 
+<p>
+<a href={{ edit_url }}>Edit name</a> <a href={{ url_for('create_game') }}>New game</a>
+</p>
+
 {% endblock %}
diff --git a/templates/player_select.html b/templates/player_select.html
index 79fd64d..a8eff50 100644
--- a/templates/player_select.html
+++ b/templates/player_select.html
@@ -7,9 +7,11 @@
 <p>
 Please select your player:
 <br/>
+<ul class=playerlist>
 {% for player in players %}
-<a href=./edit/{{ player }}>{{ player }}</a>
+<li><a href=./edit/{{ player }}>{{ player }}</a></li>
 {% endfor %}
+</ul>
 </p>
 
 <p>
diff --git a/werbinich.py b/werbinich.py
index d6e0d0c..c1b470b 100644
--- a/werbinich.py
+++ b/werbinich.py
@@ -46,8 +46,7 @@ def store_name(gameid, player):
 def name_show(gameid, player):
     other_players = dict(games[str(gameid)])
     other_players.pop(player,None)
-    pprint(other_players)
-    return render_template("name_show.html", current_player=player, other_players=other_players)
+    return render_template("name_show.html", current_player=player, other_players=other_players, edit_url=url_for("name_edit", gameid=gameid, player=player))
 
 @app.errorhandler(KeyError)
 def not_found(error):
