Complete update to the layout system