Added Alarm tile and some refactorings