Merge branch 'feature/hf/resistanceresources' into feature/hf/resistancetraining
Fix extra code spacing and change to `data-type="horizontal"` for some buttons
Merge branch 'feature/hf/resistancetraining' into feature/hf/resistanceresources
Fix for duplicate IDs caused by popup ID
Be more specific with Android message
Correct non-existant href