Clean up the mess in translations
Reorganization of menu