Changed to flat-style badges