Use badges instead of own styling

Thanks to @cls-design for the idea