Re-arrange badges