Water: Rework layout to fit within 900px wide