Added many UI enhancements