Update i18n; Improve PopupMenu layout