Add Assessment UI Fixes