Navigation Issue fixing