Massive update to the layout and scaffolding