- Fix counting plans
- Refactor strength & cardio lines
