Fixes for Enrollment and revamped modal translucent view
Classes cleanup