add the popup to the nodone activity, correction bugs