Various improvements on the galleries to enable i18n