Added Duranda and Navigation.ts