[enh] layout enhancement