More changes to alarm. This time in model and gui.