Re-arrange badges again