Add Localization
Fix Sub-menu bug