Popup has been changed, some bugs fixed and some gettext added.