Hide modal when safeDone is called + fixes Maxime's string I18n interpolation + some refactoring