tightening up the layout