Improve BadgesListView