diff --git a/app/main/routes.py b/app/main/routes.py
index a077d35..eff101d 100644
--- a/app/main/routes.py
+++ b/app/main/routes.py
@@ -145,7 +145,10 @@ def get_user_locations(game, username, mode, last_update):
     if mode == 'accumulative':
         if game.end_time < last_update:
             return []
-        return [location for location in user.locations_during_game(game) if location.timestamp - last_update > timedelta(milliseconds=1)]
+        locations = user.locations_during_game(game)
+        if not locations:
+            return None
+        return [location for location in locations if location.timestamp - last_update > timedelta(milliseconds=1)]
 
 @bp.route('/user/<username>')
 @login_required
diff --git a/app/models/game.py b/app/models/game.py
index df1ffb8..2822301 100644
--- a/app/models/game.py
+++ b/app/models/game.py
@@ -32,6 +32,9 @@ class Game(db.Model):
         backref=db.backref('game', lazy='joined'),
         cascade="save-update, merge, delete, delete-orphan")
 
+    def usernames(self):
+        return [user.name for user in self.users]
+
     def last_player_locations(self, offset=None):
         # pylint: disable=not-an-iterable
         return [location for location in
diff --git a/app/models/user.py b/app/models/user.py
index 127012a..60fa731 100644
--- a/app/models/user.py
+++ b/app/models/user.py
@@ -24,7 +24,6 @@ class User(UserMixin, db.Model):
     games = association_proxy('user_games', 'game',
         creator=lambda game: GamePlayer(game=game))
 
-
     locations = db.relationship(
         'Location',
         lazy='select',
diff --git a/app/static/assets/leaflet/utils.js b/app/static/assets/leaflet/utils.js
index 4a1d6d4..4bfb76a 100644
--- a/app/static/assets/leaflet/utils.js
+++ b/app/static/assets/leaflet/utils.js
@@ -89,3 +89,40 @@ function getMap(){
     }).addTo( map );
     return map
 }
+
+var csrftoken = $('meta[name=csrf-token]').attr('content')
+    $.ajaxSetup({
+        beforeSend: function(xhr, settings) {
+            if (!/^(GET|HEAD|OPTIONS|TRACE)$/i.test(settings.type) && !this.crossDomain) {
+                xhr.setRequestHeader("X-CSRFToken", csrftoken)
+            }
+        }
+    })
+
+function pollLocations(url, requestedUsers, mode, playerLocations, responseHandler) {
+    $.ajax({
+        type: "POST",
+        url: url,
+        data: JSON.stringify({
+            requested_users: requestedUsers,
+            mode: mode,
+            last_update: moment(get_latest_date(playerLocations)).format("YYYY-MM-DD HH:mm:ss:SSSS")
+        }),
+        contentType: "application/json; charset=utf-8",
+        dataType: 'json',
+        success: function(data){
+            responseHandler(
+                data.filter(item => item.latitude && item.longitude && item.timestamp_utc && item.username)
+            )
+        },
+        error: function(error) {
+            console.log(error);
+        }
+    });
+}
+
+function get_latest_date(playerLocations){
+    return new Date(Math.max.apply(null, playerLocations.map(function(e) {
+        return new Date(e.timestamp_utc);
+    })));
+}
\ No newline at end of file
diff --git a/app/templates/game_owner_dashboard.html b/app/templates/game_owner_dashboard.html
index 7c13628..4f5aeb7 100644
--- a/app/templates/game_owner_dashboard.html
+++ b/app/templates/game_owner_dashboard.html
@@ -4,10 +4,10 @@
 {{ super() }}
 <link rel="stylesheet" href="{{ url_for('static', filename='assets/leaflet/leaflet.css') }}" />
 <script src="{{ url_for('static', filename='assets/leaflet/leaflet.js') }}"></script>
-<script src="{{ url_for('static', filename='assets/leaflet/utils.js') }}"></script>
 {% endblock %}
 
 {% block app_content %}
+<meta name="csrf-token" content="{{ csrf_token() }}">
 <h1>{{ game.name }} Dashboard</h1>
 <a href="{{ url_for('game.change_game_settings', game_name=game.name) }}">
     <button class="btn btn-primary">Change Game Settings</button>
@@ -97,25 +97,65 @@
 
 {% 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 map = getMap()
+    var objectMarkers = []
+    var playerMarkers = []
     var objectives = JSON.parse('{{ json.dumps(game.objectives, cls=objective_encoder)|safe }}')
 
     for (var i = 0; i < objectives.length; i++){
         addObjectiveMarker(map, objectives[i])
-        markers.push([objectives[i].latitude, objectives[i].longitude])
+        objectMarkers.push([objectives[i].latitude, objectives[i].longitude])
     }
 
     var players = JSON.parse('{{ json.dumps(game.last_player_locations(), cls=location_encoder)|safe }}')
-    for (var i = 0; i < players.length; i++){
-        addPlayerMarker(map, players[i])
-        markers.push([players[i].latitude, players[i].longitude])
+    updatePlayerMarkers()
+
+    if (objectMarkers.length + playerMarkers.length > 0) {
+        map.fitBounds(objectMarkers.concat(playerMarkers));
     }
 
-    if (markers.length > 0) {
-        map.fitBounds(markers);
+    function updatePlayerMarkers(){
+        if(playerMarkers != undefined){
+            playerMarkers.forEach(function(marker){
+                marker.remove()
+            });
+        }
+        playerMarkers = []
+        for (var i = 0; i < players.length; i++) {
+            playerMarkers.push(addPlayerMarker(map, players[i], bluePlayerIcon))
+        }
+    }
+
+    // Poll Locations
+    usernames = JSON.parse('{{ json.dumps(game.usernames())|safe }}')
+    setInterval(function() {
+        pollLocations(
+            "{{ url_for('main.poll_locations', game_name=game.name) }}",
+            usernames,
+            'accumulative',
+            players,
+            handleResponse
+            )}, 30 * 1000);
+
+    function handleResponse(data){
+        data.forEach(function (location) {
+            player = players.filter(function (player) {
+                return player.username == location.username;
+            })[0];
+            if (new Date(location.timestamp_utc) > new Date(player.timestamp_utc)){
+                //lastLocation = player[player.length-1] Not necesary because there is just one of each player
+                if (player.latitude == location.latitude && player.longitude == location.longitude){
+                    player.timestamp_utc = location.timestamp_utc
+                } else{
+                    players = players.filter(p => p !== player)
+                    players.push(location)
+                }
+            }
+        });
+        updatePlayerMarkers()
     }
 
 </script>
diff --git a/app/templates/game_player.html b/app/templates/game_player.html
index f811419..a12c596 100644
--- a/app/templates/game_player.html
+++ b/app/templates/game_player.html
@@ -5,7 +5,6 @@
 {{ super() }}
 <link rel="stylesheet" href="{{ url_for('static', filename='assets/leaflet/leaflet.css') }}" />
 <script src="{{ url_for('static', filename='assets/leaflet/leaflet.js') }}"></script>
-<script src="{{ url_for('static', filename='assets/leaflet/utils.js') }}"></script>
 {% endblock %}
 
 {% block app_content %}
@@ -74,6 +73,7 @@
 
 {% block scripts %}
 {{ super() }}
+<script src="{{ url_for('static', filename='assets/leaflet/utils.js') }}"></script>
 <script type="text/javascript" , crossorigin="anonymous">
     // Leaflet Map
     map = getMap()
@@ -120,51 +120,24 @@
     }
     
     // Poll Locations
-    var csrftoken = $('meta[name=csrf-token]').attr('content')
-    $.ajaxSetup({
-        beforeSend: function(xhr, settings) {
-            if (!/^(GET|HEAD|OPTIONS|TRACE)$/i.test(settings.type) && !this.crossDomain) {
-                xhr.setRequestHeader("X-CSRFToken", csrftoken)
-            }
-        }
-    })
-
-    function get_newest_date(locations){
-        return new Date(Math.max.apply(null, locations.map(function(e) {
-            return new Date(e.timestamp_utc);
-        })));
-    }
-    
-    setInterval(function() {pollLocations()}, 30 * 1000);
-
-    function pollLocations() {
-        $.ajax({
-            type: "POST",
-            url: "{{ url_for('main.poll_locations', game_name=player.game.name) }}",
-            data: JSON.stringify({
-                
-                requested_users: ['{{ player.user.name }}'],
-                mode: 'accumulative',
-                last_update: moment(get_newest_date(locations)).format("YYYY-MM-DD HH:mm:ss:SSSS")
-            }),
-            contentType: "application/json; charset=utf-8",
-            dataType: 'json',
-            success: handleResponse,
-            error: function(error) {
-                console.log(error);
-            }
-        });
-    }
+        
+    setInterval(function() {
+        pollLocations(
+            "{{ url_for('main.poll_locations', game_name=player.game.name) }}",
+            ['{{ player.user.name }}'],
+            'accumulative',
+            locations,
+            handleResponse
+            )}, 30 * 1000);
 
     function handleResponse(data){
-        data.filter(item => item.latitude && item.longitude && item.timestamp_utc && item.username)
-        .forEach(function (item, index) {
-            if (item.username == '{{ player.user.name }}' && new Date(item.timestamp_utc) > get_newest_date(locations) ){
-                lastItem = locations[locations.length-1]
-                if (lastItem.latitude == item.latitude && lastItem.longitude == item.longitude){
-                    lastItem.timestamp_utc = item.timestamp_utc
+        data.forEach(function (location) {
+            if (location.username == '{{ player.user.name }}' && new Date(location.timestamp_utc) > get_latest_date(locations) ){
+                lastLocation = locations[locations.length-1]
+                if (lastLocation.latitude == location.latitude && lastLocation.longitude == location.longitude){
+                    lastLocation.timestamp_utc = location.timestamp_utc
                 } else{
-                    locations.push(item)
+                    locations.push(location)
                 }
             }
         });