Errors management, resource bundle text for tray and some refactor.