UI scaffolding tweaks