change navigation. Clean up badges and stands