UI enhancements + Comments