first UI enhancements