Issue #106: clear popup, clean up, translations

I have modified code according to your previous suggestions and made some clean ups. Translations were modified also.