Improved map print