UX: Reorder Add Medication fields, rename fields, improve UX#164

waseefakhtar merged 1 commit intomainwaseefakhtar/dose-android:mainfrom

ux/add-medication-reorderwaseefakhtar/dose-android:ux/add-medication-reorderCopy head branch name to clipboard