Reworked headers and badges