Simplify layouts