NXP-12544: Improve graph display to keep it close to the one in Studio