Minor changes
Minor changes
Merge
Layouts and some functionality for the alarms
Added an activity