Re-did the navigation bar