Temporal fix for navigation. WIP

commited only that other members could see what the problem is