Improve layout of heat map