navigation changes. some fix