David's updates and Menu fix