Popup made reusable
Merge branch 'dev_atimu'