Timeline + Badges fine-tuning