Fix #30 and fix #20

Removed dialog and just used activity for the popup.