UI tweaks and enhancements