tightening up layout