diff --git a/app/templates/game_bunny_dashboard.html b/app/templates/game_bunny_dashboard.html
index 212349b..0d8b8b2 100644
--- a/app/templates/game_bunny_dashboard.html
+++ b/app/templates/game_bunny_dashboard.html
@@ -19,8 +19,6 @@
         <thead>
             <tr>
                 <th scope="col">Objective Name</th>
-                <th scope="col">Latitude</th>
-                <th scope="col">Longitude</th>
                 <th scope="col">Found</th>
             </tr>
         </thead>
@@ -28,8 +26,6 @@
             {% for objective in game.objectives %}
             <tr>
                 <td>{{ objective.name }}</td>
-                <td>{{ objective.latitude }}</td>
-                <td>{{ objective.longitude }}</td>
                 <td>{{ 'Yes' if objective in current_user.player_in(game).found_objectives else 'No' }}</td>
             </tr>
             {% endfor %}
@@ -44,39 +40,8 @@
 </div>
 </div>
 
-{% if game.objectives %}
-<div class="row">
-  <div class="col-xs-1 col-md-1"></div>
-  <div id="map" style=" height: 500px; border-radius: 10px; " class="col-xs-10 col-md-10"></div>
-  <div class="col-xs-1 col-md-1"></div>
-</div>
-{% endif %}
-
 {% endblock %}
 
 {% block scripts %}
 {{ super() }}
-<script src="{{ url_for('static', filename='assets/leaflet/utils.js') }}"></script>
-<script type="text/javascript", crossorigin="anonymous">
-    // Leaflet Map
-    map = getMap()
-    markers = []
-    var objectives = JSON.parse('{{ current_user.player_in(game).encode_objectives() |safe }}')
-    for (var i = 0; i < objectives.length; i++){
-        markers.push(addObjectiveMarker(map, objectives[i]))
-    }
-    
-    function updateSelf() {
-        getPosition(updateMyLocation)
-    }
-    setInterval(updateSelf, 10 * 1000);
-    updateSelf()
-
-    if (markers.length > 1) {
-        map.fitBounds(markers.map(m => m.getLatLng()));
-    } else if (markers.length == 1){
-        map.setView(markers[0].getLatLng(), 10);
-    }
-
-</script>
 {% endblock %}
diff --git a/app/templates/game_player.html b/app/templates/game_player.html
index 2234642..36060d1 100644
--- a/app/templates/game_player.html
+++ b/app/templates/game_player.html
@@ -68,6 +68,51 @@
     </div>
 </div>
 {% endif %}
+
+{% if player.found_objectives %}
+
+<div class="row">
+    <h2>Found Objectives:</h2>
+    <div class="table-responsive">
+        <table class="table">
+            <thead>
+                <tr>
+                    <th scope="col">Objective name</th>
+                    <th scope="col">Time</th>
+                    <th scope="col">Coordiates</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for pfo in player.found_objectives %}
+                <tr>
+                    <td>{{ pfo.objective.name }}</td>
+                    <td>{{ moment(pfo.timestamp).fromNow() }}</td>
+                    <td>{{ pfo.objective.latitude }}, {{ pfo.objective.longitude }}</td>
+                </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    </div>
+</div>
+<div class="table">
+    <table class="table">
+        <thead>
+            <tr>
+                <th scope="col">Objective Name</th>
+                <th scope="col">Found</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for objective in game.objectives %}
+            <tr>
+                <td>{{ objective.name }}</td>
+                <td>{{ 'Yes' if objective in current_user.player_in(game).found_objectives else 'No' }}</td>
+            </tr>
+            {% endfor %}
+        </tbody>
+    </table>
+</div>
+{% endif %}
 {% endblock %}