Navigation Bar fixes
Merge resolve