fixed bugs from master class for makeup page comtinue