More UI tweaks and enhancements