Scaffolding UI fixes