Added alarm list and small tweaks