simplify and improve layout