update and organize badges