ITTE-1159 substantially changed the UI classes