AlarmActivity fix and update