Improve waterfall layout.