small changes
ability to reselect dosage
Several changes
Merge branch 'USSD-branch-v3'