Improved handling of the object manager in navbar modules.