Improve Badge Rendering