Added more scaffolding, CSS