tightened up the layout a little