#159 Improve map report look