FIxed some visualisation bugs