Added Alex's changes to alarm classes and database implementations.
Added changes to alarm settings screens.