UI enhancements

Tweaks and fixes