Assessment Type UI fixes