diff --git a/web/ons-demo/data/configuration.json b/web/ons-demo/data/configuration.json
index 4d38d5f..91490e4 100644
--- a/web/ons-demo/data/configuration.json
+++ b/web/ons-demo/data/configuration.json
@@ -61,7 +61,7 @@
 			"lat": 41.225925,
 			"lng": -74.00528,
 			"label": "NYC",
-			"fanOutAngle": 135
+			"fanOutAngle": 150
 		},
 		"00:00:00:00:ba:5e:ba:13": {
 			"lat": 37.901187,
diff --git a/web/ons-demo/data/configuration.json.dev b/web/ons-demo/data/configuration.json.dev
index c2a2e6b..829fa11 100644
--- a/web/ons-demo/data/configuration.json.dev
+++ b/web/ons-demo/data/configuration.json.dev
@@ -18,27 +18,27 @@
 	],
 	"association": {
 		"00:00:00:00:00:00:01:01": [
-			"00:00:00:00:00:00:07:01"
+			"00:00:00:00:00:00:08:01"
 		],
 		"00:00:00:00:00:00:01:02": [
-			"00:00:00:00:00:00:06:01"
+			"00:00:00:00:00:00:02:01"
 		],
 		"00:00:00:00:00:00:01:03": [
 			"00:00:00:00:00:00:03:01"
 		],
 		"00:00:00:00:00:00:01:04": [
-			"00:00:00:00:00:00:08:01"
-		],
-		"00:00:00:00:00:00:01:05": [
-			"00:00:00:00:00:00:02:01"
-		],
-		"00:00:00:00:00:00:01:06": [
 			"00:00:00:00:00:00:04:01",
 			"00:00:00:00:00:00:05:01"
+		],
+		"00:00:00:00:00:00:01:05": [
+			"00:00:00:00:00:00:06:01"
+		],
+		"00:00:00:00:00:00:01:06": [
+			"00:00:00:00:00:00:07:01"
 		]
 	},
 	"geo": {
-		"00:00:00:00:00:00:01:01": {
+		"00:00:00:00:00:00:01:03": {
 			"lat": 33.758599,
 			"lng": -84.387360,
 			"label": "ATL",
@@ -50,7 +50,7 @@
 			"label": "DC",
 			"fanOutAngle": 45
 		},
-		"00:00:00:00:00:00:01:03": {
+		"00:00:00:00:00:00:01:06": {
 			"lat": 41.891033,
 			"lng": -87.628326,
 			"label": "CHI",
@@ -68,11 +68,11 @@
 			"label": "SEA",
 			"fanOutAngle": 270
 		},
-		"00:00:00:00:00:00:01:06": {
+		"00:00:00:00:00:00:01:01": {
 			"lat": 41.225925,
 			"lng": -74.00528,
 			"label": "NYC",
 			"fanOutAngle": 135
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/web/ons-demo/js/map.js b/web/ons-demo/js/map.js
index 62df872..7662aaf 100644
--- a/web/ons-demo/js/map.js
+++ b/web/ons-demo/js/map.js
@@ -2,7 +2,7 @@
 
 var projection = d3.geo.mercator()
     .center([82, 46])
-    .scale(8000)
+    .scale(10000)
     .rotate([-180,0]);
 
 var switchXML;
@@ -164,8 +164,13 @@
 }
 
 var fanOutAngles = {
-	aggregation: 90,
-	edge: 7
+	aggregation: 100,
+	edge: 5
+}
+
+var fanOutDistances = {
+	aggregation: 60,
+	edge: 140
 }
 
 function makeSwitchesModel(switches, className) {
@@ -187,8 +192,8 @@
 				fanOutAngle -= (upstreamGeo.count - 1) * fanOutAngles[className]/2;
 
 				var angle = toRadians(fanOutAngle);
-				var xOff = Math.sin(angle) * widths[className] * 20;
-				var yOff = Math.cos(angle) * widths[className] * 20;
+				var xOff = Math.sin(angle) * fanOutDistances[className];
+				var yOff = Math.cos(angle) * fanOutDistances[className];
 
 				pos = [pos[0] + xOff, pos[1] + yOff];