Merge "[UI] UI enhancements"