Added more scaffolding, layout tidied up