Improvements to map display & content