Significant layout improvements.