Began to work on shell of table showing alarms.
Merge remote-tracking branch 'origin/master'