Improved formatting of badges