some main menu organization and removed some unused classes