Enrollment UI polish

Enrollment UI polish