Popup enhancement

I have enhanced the pop up as mentioned in issue #51