layout tightened up