Fix DiagonalHeatmap cell size
Fix DiagonalHeatmap behaviour
Code cleaning
Fix merge conflicts