reformat some layouts