Fix some layouts