Navigation Issue fixed