Add miscellanous UX enhancements