Scaffolding update (bootstrap 3)