Menu fixes

A few fixes and cleanups for the menu system