Cleaned up how the navigation is set up