Tightening up the layout.