Fixing Button issues in Popup

Fixing Button issues in Popup