refactored the navigation view