UI enhancements working