Added some cosmetic improvements to the alarm-box
Merge remote-tracking branch 'origin/1.10'