Merge "navigationbar - refactoring 4"