Tweaked layout; Added remaining data points.