Adjust menu system handling