Additions to Alarm UI