Arrange badges better