Brought the layout to its basic structure