cleanups
assorted UI cleanups and minor optimisations