Merge "Extract plugin interface for nav bar"