Scaffolding UI tweaks