Tightened the layout