Reorganize badges