Fix graph and design