Further YUI tweaks / cleanups