Updated EFF for menu system