Updated Navigation Issue