Small changes to show badges