fix up some layouts