Updates

New alarm screen layout
Removal of duplicated code