diff --git a/app/templates/_game_player_info.html b/app/templates/_game_player_info.html
index b1d512c..cba60d2 100644
--- a/app/templates/_game_player_info.html
+++ b/app/templates/_game_player_info.html
@@ -3,15 +3,19 @@
     <table class="table">
         <tr>
             <th>My Role</th>
-            <td>{{ current_user.}}</td>
+            <td>{{ current_user.role_in_game(game).name }}</td>
+        </tr>
+        <tr>
+            <th>Game State</th>
+            <td>{{ game.state.name }}</td>
         </tr>
         <tr>
             <th>Start Time</th>
-            <td>10:00</td>
+            <td>{% if game.start_time %}{{ moment(game.start_time).format('DD-MM-YYYY, hh:mm')}}{% else %}-{% endif %}</td>
         </tr>
         <tr>
             <th>End Time</th>
-            <td>18:00</td>
+            <td>{% if game.end_time %}{{ moment(game.end_time).format('DD-MM-YYYY, hh:mm')}}{% else %}-{% endif %}</td>
         </tr>
         
     </table>
diff --git a/app/templates/game_bunny_dashboard.html b/app/templates/game_bunny_dashboard.html
index 4da5150..a674330 100644
--- a/app/templates/game_bunny_dashboard.html
+++ b/app/templates/game_bunny_dashboard.html
@@ -98,7 +98,7 @@
     L.control.scale().addTo(map);
 
     L.tileLayer( 'https://geodata.nationaalgeoregister.nl/tiles/service/wmts/brtachtergrondkaartpastel/EPSG:3857/{z}/{x}/{y}.png', {
-        attribution: 'Kaartgegevens &copy; <a href="kadaster.nl">Kadaster</a>'
+        attribution: 'Kaartgegevens &copy; <a href="https://kadaster.nl">Kadaster</a>'
     }).addTo( map );
 
     var objectives = JSON.parse('{{ json.dumps(game.objectives, cls=objective_encoder)|safe }}')
diff --git a/app/templates/game_hunter_dashboard.html b/app/templates/game_hunter_dashboard.html
index 4528bf0..a9237ae 100644
--- a/app/templates/game_hunter_dashboard.html
+++ b/app/templates/game_hunter_dashboard.html
@@ -7,7 +7,7 @@
 {% endblock %}
 
 {% block app_content %}
-<h1>{{ game.name }} Dashboard</h1>
+<h1>{{ game.name }}: {{ current_user.name }}</h1>
 {% include '_game_player_info.html' %}
 <h2>Bunnies:</h2>
 <div class="table-responsive">
@@ -23,7 +23,7 @@
             {% for player in game.bunnies() %}
             <tr>
                 <td>{{ player.name }}</td>
-                <td>{{ player.caught_by_players | selectattr('game', '==', game)|list|length}}</td>
+                <td>{{ player.caught_by_players | selectattr('game', '==', game) | selectattr('catching_player', '==', current_user) |list|length}}</td>
                 <td>{% with location = player.last_location(game) %}
                         {% if location %}{{ moment(location.timestamp).fromNow()}}: {% endif %}
                         {{ location }}
@@ -52,7 +52,7 @@
     L.control.scale().addTo(map);
 
     L.tileLayer( 'https://geodata.nationaalgeoregister.nl/tiles/service/wmts/brtachtergrondkaartpastel/EPSG:3857/{z}/{x}/{y}.png', {
-        attribution: 'Kaartgegevens &copy; <a href="kadaster.nl">Kadaster</a>'
+        attribution: 'Kaartgegevens &copy; <a href="https://kadaster.nl">Kadaster</a>'
     }).addTo( map );
 
     var greenIcon = new L.Icon({
diff --git a/app/templates/game_owner_dashboard.html b/app/templates/game_owner_dashboard.html
index 4da5150..a674330 100644
--- a/app/templates/game_owner_dashboard.html
+++ b/app/templates/game_owner_dashboard.html
@@ -98,7 +98,7 @@
     L.control.scale().addTo(map);
 
     L.tileLayer( 'https://geodata.nationaalgeoregister.nl/tiles/service/wmts/brtachtergrondkaartpastel/EPSG:3857/{z}/{x}/{y}.png', {
-        attribution: 'Kaartgegevens &copy; <a href="kadaster.nl">Kadaster</a>'
+        attribution: 'Kaartgegevens &copy; <a href="https://kadaster.nl">Kadaster</a>'
     }).addTo( map );
 
     var objectives = JSON.parse('{{ json.dumps(game.objectives, cls=objective_encoder)|safe }}')
diff --git a/app/templates/objective.html b/app/templates/objective.html
index d452010..a8e86a1 100644
--- a/app/templates/objective.html
+++ b/app/templates/objective.html
@@ -69,7 +69,7 @@
     L.control.scale().addTo(map);
 
     L.tileLayer( 'https://geodata.nationaalgeoregister.nl/tiles/service/wmts/brtachtergrondkaartpastel/EPSG:3857/{z}/{x}/{y}.png', {
-        attribution: 'Kaartgegevens &copy; <a href="kadaster.nl">Kadaster</a>'
+        attribution: 'Kaartgegevens &copy; <a href="https://kadaster.nl">Kadaster</a>'
     }).addTo( map );
 
     if ('{{ owner }}' == 'True'){
diff --git a/app/templates/player.html b/app/templates/player.html
index cdaea91..45d1db4 100644
--- a/app/templates/player.html
+++ b/app/templates/player.html
@@ -48,7 +48,7 @@
     L.control.scale().addTo(map);
 
     L.tileLayer( 'https://geodata.nationaalgeoregister.nl/tiles/service/wmts/brtachtergrondkaartpastel/EPSG:3857/{z}/{x}/{y}.png', {
-        attribution: 'Kaartgegevens &copy; <a href="kadaster.nl">Kadaster</a>'
+        attribution: 'Kaartgegevens &copy; <a href="https://kadaster.nl">Kadaster</a>'
     }).addTo( map );
 
     var greenIcon = new L.Icon({