simplifying the layout again.