Added buttons and labels to Medications view
Merge remote-tracking branch 'origin/master' into master1