Implemented navigation
Merge branch 'directory_navigation'