Merge pull request #7848 from manassolanki/neilLasrado-ass-redesign

Neil lasrado assessment redesign