Simplify some layouts.