some changes in popup