Added UI enhancements