many fixes in navigation