layout and scaffolding added