fix some layouts