Fixed buttons that stopped working due to i18n