Made minor UI enhancements