Fixed the nav bar item colors
Merge conflicts fixed