Removing some i18next todos, and a little fix on remove us popover style