I18n and other style fixes