Refactoring and company name in nav