Add Assessment Type UI fixes