Resolved navigation issues