Improvements in popup
Fix issue in popup