main navigation fixes
Solve merge conflict