Simplify the layout