major changes to the layout