Fixes up the map and display
Merge branch 'master' of https://github.com/Sniffing/NetworkMe