tightened up layout