Some cleanup on the navigation