Navigation updated and works as a charm