Updates to improve graph and labels