Refactored menu handling - everything should be cleaned up on bundle
load/unload now.