Fixes for visualisation in new layout