navigation working better
more files for naviagation