Tightened up layout some more.