diff --git a/monkey/monkey_island/cc/ui/src/components/map/MapOptions.js b/monkey/monkey_island/cc/ui/src/components/map/MapOptions.js
index 742d061f4..e09e93124 100644
--- a/monkey/monkey_island/cc/ui/src/components/map/MapOptions.js
+++ b/monkey/monkey_island/cc/ui/src/components/map/MapOptions.js
@@ -41,9 +41,12 @@ export const basic_options = {
   physics: {
     barnesHut: {
       gravitationalConstant: -120000,
-      avoidOverlap: 0.5
+      avoidOverlap: 0.5,
+      springLength: 100,
+      springConstant: 0.025
     },
-    minVelocity: 0.75
+    minVelocity: 0.3,
+    maxVelocity: 25
   }
 };
 
diff --git a/monkey/monkey_island/cc/ui/src/components/pages/MapPage.js b/monkey/monkey_island/cc/ui/src/components/pages/MapPage.js
index 997a2ae4c..2962b839a 100644
--- a/monkey/monkey_island/cc/ui/src/components/pages/MapPage.js
+++ b/monkey/monkey_island/cc/ui/src/components/pages/MapPage.js
@@ -23,7 +23,8 @@ class MapPageComponent extends AuthComponent {
       telemetryLastTimestamp: null,
       isScrolledUp: false,
       telemetryLines: 0,
-      telemetryCurrentLine: 0
+      telemetryCurrentLine: 0,
+      telemetryUpdateInProgress: false
     };
     this.telemConsole = React.createRef();
     this.handleScroll = this.handleScroll.bind(this);
@@ -72,16 +73,20 @@ class MapPageComponent extends AuthComponent {
   };
 
   updateTelemetryFromServer = () => {
+    if( this.state.telemetryUpdateInProgress ) {
+      return
+    }
+    this.setState({telemetryUpdateInProgress: true});
     this.authFetch('/api/telemetry-feed?timestamp=' + this.state.telemetryLastTimestamp)
       .then(res => res.json())
       .then(res => {
         if ('telemetries' in res) {
           let newTelem = this.state.telemetry.concat(res['telemetries']);
-
           this.setState(
             {
               telemetry: newTelem,
-              telemetryLastTimestamp: res['timestamp']
+              telemetryLastTimestamp: res['timestamp'],
+              telemetryUpdateInProgress: false
             });
           this.props.onStatusChange();