Update Alarm Log and Alarm Window

Update Alarm Log and Alarm Window
Merge pull request #111 from Fance/master

Update Alarm Log and Alarm Window