Simplify the layouts