Simplify layout