Some more rough layout changes.