Fiona modify the main ui and link the alarm_tab to add new alarm
Merge remote-tracking branch 'origin/master'