refactoring - moving routines related to navigation from heidi repository