Improve map display