Added NavigationView, will be refactored with event listeners