Fix some minor navigation issues