Minor fixes to Medication Alarm and PopUp