Tighten the layout up