upgraded alarm layouts