Massive structural changes to layout