Fix navigation issues
Solve merge conflict