masive changes to the layout