More styling and scaffolding