tightened up the layout even more