Added some UI enhancements.