diff --git a/generate-map.sh b/generate-map.sh
index be7839f2b..2b5788b87 100755
--- a/generate-map.sh
+++ b/generate-map.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 ./map.php > map.dot && unflatten -l5 -f map.dot | dot -Tpng -o html/network-big.png && convert -resize 400x500 html/network-big.png html/network.png
-#./map.php > map.dot && unflatten -l5 -f map.dot | circo -Tpng -o html/network-screen-big.png && convert -resize 900x2000 html/network-screen-big.png html/network-screen.png
+./map.php > map.dot && unflatten -l5 -f map.dot | dot -Tpng -o html/network-screen-big.png && convert -resize 900x2000 html/network-screen-big.png html/network-screen.png
 
diff --git a/html/images/devices/CISCO6509.png b/html/images/devices/CISCO6509.png
new file mode 100644
index 000000000..8cc30fadd
Binary files /dev/null and b/html/images/devices/CISCO6509.png differ
diff --git a/html/images/devices/CISCO7304.gif b/html/images/devices/CISCO7304.gif
new file mode 100644
index 000000000..36a6fc3af
Binary files /dev/null and b/html/images/devices/CISCO7304.gif differ
diff --git a/html/images/devices/CISCO7606.jpg b/html/images/devices/CISCO7606.jpg
new file mode 100644
index 000000000..abcc0b79c
Binary files /dev/null and b/html/images/devices/CISCO7606.jpg differ
diff --git a/html/images/devices/CISCO7613.gif b/html/images/devices/CISCO7613.gif
new file mode 100644
index 000000000..385dfffa3
Binary files /dev/null and b/html/images/devices/CISCO7613.gif differ
diff --git a/html/images/jt-logo.jpg b/html/images/jt-logo.jpg
new file mode 100644
index 000000000..9ecd4adc1
Binary files /dev/null and b/html/images/jt-logo.jpg differ
diff --git a/html/images/observer-logo-mobile.jpg b/html/images/observer-logo-mobile.jpg
new file mode 100644
index 000000000..1f75eb0a8
Binary files /dev/null and b/html/images/observer-logo-mobile.jpg differ
diff --git a/includes/static-config.php b/includes/static-config.php
index b0b3979b8..839a78e89 100644
--- a/includes/static-config.php
+++ b/includes/static-config.php
@@ -4,7 +4,6 @@
 $config['ifdescr']['IOS'] = true;
 $config['ifdescr']['IOS XE'] = true;
 
-
 ## AFI / SAFI pairs for BGP (and other stuff, perhaps)
 $config['afi']['ipv4']['unicast']    = "IPv4";
 $config['afi']['ipv4']['multiicast'] = "IPv4 Multicast";
@@ -12,7 +11,6 @@ $config['afi']['ipv4']['vpn']        = "VPNv4";
 $config['afi']['ipv6']['unicast']    = "IPv6";
 $config['afi']['ipv6']['multicast']  = "IPv6 Multicast";
 
-
 ##############################
 # No changes below this line #
 ##############################
diff --git a/map.php b/map.php
index f4c8a3df8..2b28a89be 100755
--- a/map.php
+++ b/map.php
@@ -59,11 +59,6 @@ echo("\n}\n");
 
 }
 
-echo("\"Internet\" -> \"je.cen.pbr02\" [ arrowhead=none arrowtail=none color=navyblue weight=5 style=\"setlinewidth(4)\"];\n");
-echo("\"Internet\" -> \"je.cen.pbr01\" [ arrowhead=none arrowtail=none color=navyblue weight=5 style=\"setlinewidth(4)\"];\n");
-echo("\"Internet\" -> \"uk.thn.tbr01\" [ arrowhead=none arrowtail=none color=navyblue weight=5 style=\"setlinewidth(4)\"];\n");
-#echo("\"ADSL\" -> \"thnlon-pe01\" [ arrowhead=none arrowtail=none color=navyblue weight=5 style=\"setlinewidth(8)\"];\n");
-
 $links_sql = "SELECT *, X.ifDescr AS sif, I.ifDescr AS dif FROM links AS L, interfaces AS I, interfaces AS X, devices as D, devices as Y WHERE  I.device_id = D.device_id AND X.device_id = Y.device_id AND L.src_if = I.interface_id AND X.interface_id = L.dst_if";
 
 $links_result = mysql_query($links_sql);