Made UI enhancements