Add Assessment Screen Issue fix