Fix of menu system