Updated views to resolve navigation