Bug fixes with the menus.
Cleanup