more improvements on layouts