bugfix for badges, styling