Minor refactoring and I18n'd links