Various UI enhancements