add popup and some fix