Fixed layout on verticalheatmap,

Plus more code fixes and adaptations