Changed up the way alarms are displayed