Adapting the new alarm-site to old layout