Improve appearance of map pop-up, fix display of units