fixed NavigationBar - now working with new DataContext