Add badges and template refinements