Updated to match latest changes to chartLayout