Adjust menu and fix translation