Popup disappears if clicked outside and back button fixed.

Popup disappears if clicked outside and back button fixed.