Change unloading order
Fix unloading error - remove binary
Fix error on menu item label