Added menu bar and i18n support