View scaffolding fixes