Additional fixes to menu system