fixes on navigation