Little changes in navigation func