Small layout changes
Added ID's to handle multiple alarms