rendering for badges and some other cosmetic fixes