Added some UI enhancements